From 3b13ed25459ec9f4cbb9ee0a5e18cf1f538625e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20=C3=85berg?= Date: Wed, 30 Apr 2025 19:16:09 +0200 Subject: [PATCH] Revert "Use macos-15" This reverts commit 4654e4d6eb6feb7c8da055c5f46415016b36a28d. --- .github/workflows/build-browser.yml | 2 +- .github/workflows/build-cli.yml | 2 +- .github/workflows/build-desktop.yml | 7 +++---- .github/workflows/release-desktop-beta.yml | 10 ++++------ 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-browser.yml b/.github/workflows/build-browser.yml index fb0c4e578f0..82a1000e187 100644 --- a/.github/workflows/build-browser.yml +++ b/.github/workflows/build-browser.yml @@ -280,7 +280,7 @@ jobs: build-safari: name: Build Safari - runs-on: macos-15 + runs-on: macos-14 needs: - setup - locales-test diff --git a/.github/workflows/build-cli.yml b/.github/workflows/build-cli.yml index c732f197af6..001561c0b9b 100644 --- a/.github/workflows/build-cli.yml +++ b/.github/workflows/build-cli.yml @@ -90,7 +90,7 @@ jobs: [ { base: "linux", distro: "ubuntu-22.04", target_suffix: "" }, { base: "linux", distro: "ubuntu-22.04-arm", target_suffix: "-arm64" }, - { base: "mac", distro: "macos-15", target_suffix: "" }, + { base: "mac", distro: "macos-14", target_suffix: "" }, { base: "mac", distro: "macos-14", target_suffix: "-arm64" } ] license_type: diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml index 6d954ca1098..1bbdfe07eeb 100644 --- a/.github/workflows/build-desktop.yml +++ b/.github/workflows/build-desktop.yml @@ -655,7 +655,7 @@ jobs: macos-build: name: MacOS Build - runs-on: macos-15 + runs-on: macos-14 needs: - setup env: @@ -864,7 +864,7 @@ jobs: macos-package-github: name: MacOS Package GitHub Release Assets - runs-on: macos-15 + runs-on: macos-14 if: ${{ needs.setup.outputs.has_secrets == 'true' }} needs: - browser-build @@ -1117,7 +1117,7 @@ jobs: macos-package-mas: name: MacOS Package Prod Release Asset - runs-on: macos-15 + runs-on: macos-14 if: ${{ needs.setup.outputs.has_secrets == 'true' }} needs: - browser-build @@ -1159,7 +1159,6 @@ jobs: rustup show echo "GitHub ref: $GITHUB_REF" echo "GitHub event: $GITHUB_EVENT" - xcodebuild -showsdks - name: Get Build Cache id: build-cache diff --git a/.github/workflows/release-desktop-beta.yml b/.github/workflows/release-desktop-beta.yml index 6ae7edcc5c2..86a9079e5c6 100644 --- a/.github/workflows/release-desktop-beta.yml +++ b/.github/workflows/release-desktop-beta.yml @@ -392,7 +392,7 @@ jobs: macos-build: name: MacOS Build - runs-on: macos-15 + runs-on: macos-14 needs: setup env: _PACKAGE_VERSION: ${{ needs.setup.outputs.release_version }} @@ -524,7 +524,7 @@ jobs: macos-package-github: name: MacOS Package GitHub Release Assets - runs-on: macos-15 + runs-on: macos-14 needs: - setup - macos-build @@ -556,8 +556,7 @@ jobs: node --version npm --version echo "GitHub ref: $GITHUB_REF" - echo "GitHub event: $GITHUB_EVENT" - xcodebuild -showsdks + echo "GitHub event: $GITHUB_EVENT" - name: Get Build Cache id: build-cache @@ -738,7 +737,7 @@ jobs: macos-package-mas: name: MacOS Package Prod Release Asset - runs-on: macos-15 + runs-on: macos-14 needs: - setup - macos-build @@ -771,7 +770,6 @@ jobs: npm --version echo "GitHub ref: $GITHUB_REF" echo "GitHub event: $GITHUB_EVENT" - xcodebuild -showsdks - name: Get Build Cache id: build-cache