From 7618a230253739ba82c486f2778ace36d2cdb7a6 Mon Sep 17 00:00:00 2001 From: Taea Vogel Date: Mon, 4 Nov 2024 17:22:28 -0500 Subject: [PATCH] specify macos-15 --- .github/workflows/backend-tests.yml | 2 +- .github/workflows/desktop-build.yml | 6 +++--- .github/workflows/desktop-rtl-tests.yml | 2 +- .github/workflows/desktop-tests.yml | 2 +- .github/workflows/e2e-ios.yml | 2 +- .github/workflows/e2e-mac.yml | 6 +++--- .github/workflows/identity-tests.yml | 2 +- .github/workflows/integration-tests.yml | 2 +- .github/workflows/mobile-deploy-ios.yml | 2 +- .github/workflows/state-manager-tests.yml | 2 +- .github/workflows/utils-tests.yml | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/backend-tests.yml b/.github/workflows/backend-tests.yml index 2214aa163e..8fb867c551 100644 --- a/.github/workflows/backend-tests.yml +++ b/.github/workflows/backend-tests.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: - os: [ubuntu-20.04, macos-latest, windows-2019] + os: [ubuntu-20.04, macos-15, windows-2019] steps: - uses: dorny/paths-filter@v3 diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml index d5610b8d3b..e81b717498 100644 --- a/.github/workflows/desktop-build.yml +++ b/.github/workflows/desktop-build.yml @@ -98,7 +98,7 @@ jobs: build-macos: # needs: run-e2e-tests-mac - runs-on: macos-latest + runs-on: macos-15 if: | startsWith(github.ref, 'refs/tags/@quiet/desktop') @@ -168,8 +168,8 @@ jobs: GITHUB_TOKEN: ${{ github.token }} with: upload_url: ${{ steps.get_release.outputs.upload_url }} - asset_path: ./packages/desktop/dist/Quiet-${{ steps.extract_version.outputs.version}}-arm64.dmg - asset_name: Quiet-${{ steps.extract_version.outputs.version}}-arm64.dmg + asset_path: ./packages/desktop/dist/Quiet-${{ steps.extract_version.outputs.version}}.dmg + asset_name: Quiet-${{ steps.extract_version.outputs.version}}.dmg asset_content_type: application/.dmg build-windows: diff --git a/.github/workflows/desktop-rtl-tests.yml b/.github/workflows/desktop-rtl-tests.yml index 8adbaa017e..4d29fd849d 100644 --- a/.github/workflows/desktop-rtl-tests.yml +++ b/.github/workflows/desktop-rtl-tests.yml @@ -10,7 +10,7 @@ jobs: strategy: matrix: - os: [ubuntu-20.04, macos-latest] + os: [ubuntu-20.04, macos-15] steps: - uses: dorny/paths-filter@v3 diff --git a/.github/workflows/desktop-tests.yml b/.github/workflows/desktop-tests.yml index 16f227724a..91cf2a616b 100644 --- a/.github/workflows/desktop-tests.yml +++ b/.github/workflows/desktop-tests.yml @@ -10,7 +10,7 @@ jobs: strategy: matrix: - os: [ubuntu-20.04, macos-latest] + os: [ubuntu-20.04, macos-15] steps: - uses: dorny/paths-filter@v3 diff --git a/.github/workflows/e2e-ios.yml b/.github/workflows/e2e-ios.yml index 01544c3e4f..bd7bf1ebe9 100644 --- a/.github/workflows/e2e-ios.yml +++ b/.github/workflows/e2e-ios.yml @@ -5,7 +5,7 @@ on: workflow_dispatch jobs: detox-ios: timeout-minutes: 25 - runs-on: [macos-latest-xlarge] + runs-on: [macos-15-xlarge] steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/e2e-mac.yml b/.github/workflows/e2e-mac.yml index 51fa52a8d1..f17a2127cc 100644 --- a/.github/workflows/e2e-mac.yml +++ b/.github/workflows/e2e-mac.yml @@ -3,7 +3,7 @@ name: E2E Mac on: [workflow_call] jobs: mac: - runs-on: macos-latest + runs-on: macos-15 timeout-minutes: 180 env: TEST_MODE: true @@ -36,7 +36,7 @@ jobs: - name: FILE_NAME env working-directory: ./packages/desktop/dist - run: echo "FILE_NAME="Quiet-$VERSION-arm64.dmg"" >> $GITHUB_ENV + run: echo "FILE_NAME="Quiet-$VERSION.dmg"" >> $GITHUB_ENV - name: List dist dir content working-directory: ./packages/desktop/dist @@ -51,7 +51,7 @@ jobs: run: hdiutil mount $FILE_NAME - name: Add App file to applications - run: cd ~ && cp -R "/Volumes/Quiet $VERSION-arm64/Quiet.app" /Applications + run: cd ~ && cp -R "/Volumes/Quiet $VERSION/Quiet.app" /Applications - name: Run invitation link test - Includes 2 separate application clients uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0 diff --git a/.github/workflows/identity-tests.yml b/.github/workflows/identity-tests.yml index b29442ba1b..31f2d11b6b 100644 --- a/.github/workflows/identity-tests.yml +++ b/.github/workflows/identity-tests.yml @@ -10,7 +10,7 @@ jobs: strategy: matrix: - os: [ubuntu-20.04, macos-latest, windows-2019] + os: [ubuntu-20.04, macos-15, windows-2019] steps: - uses: dorny/paths-filter@v3 diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 9bcd21f2f6..ec714e29f8 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: - os: [ubuntu-20.04] #, macos-latest, windows-2019] + os: [ubuntu-20.04] #, macos-15, windows-2019] steps: - name: 'Print OS' diff --git a/.github/workflows/mobile-deploy-ios.yml b/.github/workflows/mobile-deploy-ios.yml index 4eb1213c98..e3d6a45df5 100644 --- a/.github/workflows/mobile-deploy-ios.yml +++ b/.github/workflows/mobile-deploy-ios.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: - os: [macos-latest] + os: [macos-15] steps: - name: "Print OS" diff --git a/.github/workflows/state-manager-tests.yml b/.github/workflows/state-manager-tests.yml index bf782e2aac..22dbd8ce76 100644 --- a/.github/workflows/state-manager-tests.yml +++ b/.github/workflows/state-manager-tests.yml @@ -10,7 +10,7 @@ jobs: strategy: matrix: - os: [ubuntu-20.04, macos-latest] + os: [ubuntu-20.04, macos-15] steps: - uses: dorny/paths-filter@v3 diff --git a/.github/workflows/utils-tests.yml b/.github/workflows/utils-tests.yml index 2bce44083f..95281dc2a3 100644 --- a/.github/workflows/utils-tests.yml +++ b/.github/workflows/utils-tests.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: - os: [ubuntu-20.04, macos-latest, windows-2019] + os: [ubuntu-20.04, macos-15, windows-2019] steps: - name: "Print OS"