Merge remote-tracking branch 'origin/unstable' into release/1.14.0

oxen-io · Sep 23, 2024 · f3cf19d · f3cf19d
2 parents 5d9261d + 3551adf
commit f3cf19d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml
@@ -26,7 +26,8 @@ jobs:
       fail-fast: false
       matrix:
         # We want a mac arm64 build, and according to this https://github.com/actions/runner-images#available-images macos-14 is always arm64
-        os: [windows-2022, ubuntu-20.04, macos-12, macos-14]
+        # macos-14 is disabled for now as we hit our free tier limit for macos builds
+        os: [windows-2022, ubuntu-20.04, macos-12]
     env:
       SIGNAL_ENV: production
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -77,7 +78,7 @@ jobs:
         working-directory: ./release/
 
       - name: Upload Production Artifacts
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ runner.os }}-${{ runner.arch }}-production
           path: release
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -20,7 +20,8 @@ jobs:
       fail-fast: false
       matrix:
         # We want a mac arm64 build, and according to this https://github.com/actions/runner-images#available-images macos-14 is always arm64
-        os: [windows-2022, ubuntu-20.04, macos-12, macos-14]
+        # macos-14 is disabled for now as we hit our free tier limit for macos builds
+        os: [windows-2022, ubuntu-20.04, macos-12]
     env:
       SIGNAL_ENV: production
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}