From 74d01eca81923bee58dd9311b5a3fb9d0ecdaa1c Mon Sep 17 00:00:00 2001
From: Andy Pixley <3723676+pixman20@users.noreply.github.com>
Date: Mon, 28 Apr 2025 04:14:09 -0400
Subject: [PATCH] [BRE-784] Fixing web vault build to pull valid server ref
 (#14382)

---
 .github/workflows/build-web.yml | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-web.yml b/.github/workflows/build-web.yml
index fb429468134..4ca6dc25aab 100644
--- a/.github/workflows/build-web.yml
+++ b/.github/workflows/build-web.yml
@@ -133,12 +133,34 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
+      - name: Get Latest Server Version
+        id: latest-server-version
+        uses: bitwarden/gh-actions/get-release-version@main
+        with:
+          repository: bitwarden/server
+          trim: false
+
+      - name: Set Server Ref
+        id: set-server-ref
+        run: |
+          SERVER_REF="${{ steps.latest-server-version.outputs.version }}"
+          echo "Latest server release version: $SERVER_REF"
+          if [[ "$GITHUB_REF" == "refs/heads/main" ]]; then
+            SERVER_REF="$GITHUB_REF"
+          elif [[ "$GITHUB_REF" == "refs/heads/rc" ]]; then
+            SERVER_REF="$GITHUB_REF"
+          elif [[ "$GITHUB_EVENT_NAME" == "pull_request" ]]; then
+            SERVER_REF="refs/heads/main"
+          fi
+          echo "Server ref: $SERVER_REF"
+          echo "server_ref=$SERVER_REF" >> $GITHUB_OUTPUT
+
       - name: Check out Server repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           path: server
           repository: bitwarden/server
-          ref: ${{ github.event.pull_request.head.sha && 'main' || github.ref }}
+          ref: ${{ steps.set-server-ref.outputs.server_ref }}
 
       - name: Check Branch to Publish
         env:
@@ -160,7 +182,7 @@ jobs:
           VERSION=$( jq -r ".version" package.json)
           jq --arg version "$VERSION+${GITHUB_SHA:0:7}" '.version = $version' package.json > package.json.tmp
           mv package.json.tmp package.json
-      
+
       ########## Set up Docker ##########
       - name: Set up Docker
         uses: docker/setup-docker-action@b60f85385d03ac8acfca6d9996982511d8620a19 # v4.3.0
@@ -304,7 +326,7 @@ jobs:
       - name: Log out of Docker
         run: docker logout $_AZ_REGISTRY
 
-  
+
   crowdin-push:
     name: Crowdin Push
     if: github.event_name != 'pull_request_target' && github.ref == 'refs/heads/main'