Skip to content

Commit 2cb810c

Browse files
committed
[BRE-784] Fixing web vault build to pull valid server ref (#14382)
(cherry picked from commit 74d01ec)
1 parent cb02197 commit 2cb810c

File tree

1 file changed

+25
-3
lines changed

1 file changed

+25
-3
lines changed

.github/workflows/build-web.yml

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,12 +133,34 @@ jobs:
133133
with:
134134
ref: ${{ github.event.pull_request.head.sha }}
135135

136+
- name: Get Latest Server Version
137+
id: latest-server-version
138+
uses: bitwarden/gh-actions/get-release-version@main
139+
with:
140+
repository: bitwarden/server
141+
trim: false
142+
143+
- name: Set Server Ref
144+
id: set-server-ref
145+
run: |
146+
SERVER_REF="${{ steps.latest-server-version.outputs.version }}"
147+
echo "Latest server release version: $SERVER_REF"
148+
if [[ "$GITHUB_REF" == "refs/heads/main" ]]; then
149+
SERVER_REF="$GITHUB_REF"
150+
elif [[ "$GITHUB_REF" == "refs/heads/rc" ]]; then
151+
SERVER_REF="$GITHUB_REF"
152+
elif [[ "$GITHUB_EVENT_NAME" == "pull_request" ]]; then
153+
SERVER_REF="refs/heads/main"
154+
fi
155+
echo "Server ref: $SERVER_REF"
156+
echo "server_ref=$SERVER_REF" >> $GITHUB_OUTPUT
157+
136158
- name: Check out Server repo
137159
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
138160
with:
139161
path: server
140162
repository: bitwarden/server
141-
ref: ${{ github.event.pull_request.head.sha && 'main' || github.ref }}
163+
ref: ${{ steps.set-server-ref.outputs.server_ref }}
142164

143165
- name: Check Branch to Publish
144166
env:
@@ -160,7 +182,7 @@ jobs:
160182
VERSION=$( jq -r ".version" package.json)
161183
jq --arg version "$VERSION+${GITHUB_SHA:0:7}" '.version = $version' package.json > package.json.tmp
162184
mv package.json.tmp package.json
163-
185+
164186
########## Set up Docker ##########
165187
- name: Set up Docker
166188
uses: docker/setup-docker-action@b60f85385d03ac8acfca6d9996982511d8620a19 # v4.3.0
@@ -304,7 +326,7 @@ jobs:
304326
- name: Log out of Docker
305327
run: docker logout $_AZ_REGISTRY
306328

307-
329+
308330
crowdin-push:
309331
name: Crowdin Push
310332
if: github.event_name != 'pull_request_target' && github.ref == 'refs/heads/main'

0 commit comments

Comments
 (0)