enable build

AiraYumi · Nov 26, 2024 · ea4616f · ea4616f
1 parent 64c6c0e
commit ea4616f
Showing 1 changed file with 7 additions and 12 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -3,7 +3,7 @@ name: Build
 on:
   pull_request:
   push:
-    branches: ["main", "release/*", "project/*"]
+    branches: ["main", "release/*", "project/*", "update_openssl-with-build"]
     tags: ["Second_Life*"]
 
 jobs:
@@ -34,23 +34,18 @@ jobs:
         run: |
           echo "release_run=$RELEASE_RUN" >> "$GITHUB_OUTPUT"
 
-          if [[ "$FROM_FORK" == "true" ]]; then
-            # PR from fork; don't build with Bugsplat, proprietary libs
-            echo 'config=ReleaseOS' >> $GITHUB_OUTPUT
-            echo "bugsplat_db=" >> $GITHUB_OUTPUT
-          else
-            echo 'config=Release' >> $GITHUB_OUTPUT
-            echo "bugsplat_db=SecondLife_Viewer_2018" >> $GITHUB_OUTPUT
-          fi
+          # PR from fork; don't build with Bugsplat, proprietary libs
+          echo 'config=ReleaseOS' >> $GITHUB_OUTPUT
+          echo "bugsplat_db=" >> $GITHUB_OUTPUT
   build:
     needs: setup
     continue-on-error: ${{ matrix.experimental }}
     strategy:
       matrix:
-        runner: [windows-large, macos-15-xlarge]
+        runner: [windows-2022, macos-15]
         experimental: [false]
         include:
-        - runner: linux-large
+        - runner: ubuntu-22.04
           experimental: true
     runs-on: ${{ matrix.runner }}
     outputs:
@@ -331,7 +326,7 @@ jobs:
       AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
       AZURE_TENANT_ID:     ${{ secrets.AZURE_TENANT_ID }}
     needs: build
-    runs-on: windows-large
+    runs-on: windows-latest
     steps:
       - name: Sign and package Windows viewer
         if: env.AZURE_KEY_VAULT_URI && env.AZURE_CERT_NAME && env.AZURE_CLIENT_ID && env.AZURE_CLIENT_SECRET && env.AZURE_TENANT_ID