From 0ecf4da6c649acb3f9b4ad516161f8ffd3a5eba8 Mon Sep 17 00:00:00 2001 From: yasserfaraazkhan Date: Tue, 13 Feb 2024 01:29:04 +0530 Subject: [PATCH 1/7] test macos-latest-xlarge --- .github/workflows/build-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 6364a3e74..e34c814c8 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -22,7 +22,7 @@ jobs: uses: ./.github/actions/test build-ios-pr: - runs-on: macos-12 + runs-on: macos-latest-xlarge if: ${{ github.event.label.name == 'Build Apps for PR' || github.event.label.name == 'Build App for iOS' }} needs: - test From d480876cb22970f80f81f6a81a9d511321b3a5e4 Mon Sep 17 00:00:00 2001 From: yasserfaraazkhan Date: Tue, 13 Feb 2024 01:31:40 +0530 Subject: [PATCH 2/7] test macos-latest-xlarge --- .github/workflows/build-pr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index e34c814c8..914c8d10d 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -24,8 +24,8 @@ jobs: build-ios-pr: runs-on: macos-latest-xlarge if: ${{ github.event.label.name == 'Build Apps for PR' || github.event.label.name == 'Build App for iOS' }} - needs: - - test + # needs: + # - test steps: - name: ci/checkout-repo uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 From dc4fb0eb50decfc4b0b2abefe731508b8e889029 Mon Sep 17 00:00:00 2001 From: yasserfaraazkhan Date: Tue, 13 Feb 2024 01:56:02 +0530 Subject: [PATCH 3/7] test macos-13-xlarge --- .github/actions/prepare-mobile-build/action.yaml | 2 ++ .github/workflows/build-pr.yml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/actions/prepare-mobile-build/action.yaml b/.github/actions/prepare-mobile-build/action.yaml index d45291dad..70864fba3 100644 --- a/.github/actions/prepare-mobile-build/action.yaml +++ b/.github/actions/prepare-mobile-build/action.yaml @@ -7,6 +7,8 @@ runs: - uses: ruby/setup-ruby@9669f3ee51dc3f4eda8447ab696b3ab19a90d14b # v1.144.0 with: ruby-version: "2.7.7" + bundler-cache: true + cache-version: 1 - name: ci/setup-fastlane-dependencies shell: bash diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 914c8d10d..94f96547a 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -22,7 +22,7 @@ jobs: uses: ./.github/actions/test build-ios-pr: - runs-on: macos-latest-xlarge + runs-on: macos-13-xlarge if: ${{ github.event.label.name == 'Build Apps for PR' || github.event.label.name == 'Build App for iOS' }} # needs: # - test From 2afd6bdc92ae512904f47e4f559314f1422602e3 Mon Sep 17 00:00:00 2001 From: yasserfaraazkhan Date: Tue, 13 Feb 2024 01:58:02 +0530 Subject: [PATCH 4/7] test macos-12-large --- .github/workflows/build-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 94f96547a..32c92226e 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -22,7 +22,7 @@ jobs: uses: ./.github/actions/test build-ios-pr: - runs-on: macos-13-xlarge + runs-on: macos-12-large if: ${{ github.event.label.name == 'Build Apps for PR' || github.event.label.name == 'Build App for iOS' }} # needs: # - test From 0ab129c18a21c65b7a3786989e0d366f43f78b70 Mon Sep 17 00:00:00 2001 From: yasserfaraazkhan Date: Tue, 13 Feb 2024 02:13:26 +0530 Subject: [PATCH 5/7] make all 12-large --- .github/actions/prepare-mobile-build/action.yaml | 2 -- .github/workflows/build-ios-beta.yml | 4 ++-- .github/workflows/build-ios-release.yml | 4 ++-- .github/workflows/build-pr.yml | 4 ++-- .github/workflows/github-release.yml | 2 +- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/actions/prepare-mobile-build/action.yaml b/.github/actions/prepare-mobile-build/action.yaml index 70864fba3..d45291dad 100644 --- a/.github/actions/prepare-mobile-build/action.yaml +++ b/.github/actions/prepare-mobile-build/action.yaml @@ -7,8 +7,6 @@ runs: - uses: ruby/setup-ruby@9669f3ee51dc3f4eda8447ab696b3ab19a90d14b # v1.144.0 with: ruby-version: "2.7.7" - bundler-cache: true - cache-version: 1 - name: ci/setup-fastlane-dependencies shell: bash diff --git a/.github/workflows/build-ios-beta.yml b/.github/workflows/build-ios-beta.yml index 6ba35bd56..7921bda3e 100644 --- a/.github/workflows/build-ios-beta.yml +++ b/.github/workflows/build-ios-beta.yml @@ -22,7 +22,7 @@ jobs: uses: ./.github/actions/test build-ios-simulator: - runs-on: macos-12 + runs-on: macos-12-large if: ${{ !contains(github.ref_name, 'beta-ios') }} needs: - test @@ -50,7 +50,7 @@ jobs: path: Mattermost-simulator-x86_64.app.zip build-and-deploy-ios-beta: - runs-on: macos-12 + runs-on: macos-12-large if: ${{ !contains(github.ref_name, 'beta-sim') }} needs: - test diff --git a/.github/workflows/build-ios-release.yml b/.github/workflows/build-ios-release.yml index 2616500e8..3d349f1af 100644 --- a/.github/workflows/build-ios-release.yml +++ b/.github/workflows/build-ios-release.yml @@ -22,7 +22,7 @@ jobs: uses: ./.github/actions/test build-and-deploy-ios-release: - runs-on: macos-12 + runs-on: macos-12-large if: ${{ !contains(github.ref_name, 'release-sim') }} needs: - test @@ -71,7 +71,7 @@ jobs: path: "*.ipa" build-ios-simulator: - runs-on: macos-12 + runs-on: macos-12-large if: ${{ !contains(github.ref_name , 'release-ios') }} needs: - test diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 32c92226e..40e869479 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -24,8 +24,8 @@ jobs: build-ios-pr: runs-on: macos-12-large if: ${{ github.event.label.name == 'Build Apps for PR' || github.event.label.name == 'Build App for iOS' }} - # needs: - # - test + needs: + - test steps: - name: ci/checkout-repo uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml index 5cb16f632..eede23975 100644 --- a/.github/workflows/github-release.yml +++ b/.github/workflows/github-release.yml @@ -15,7 +15,7 @@ jobs: uses: ./.github/actions/test build-ios-unsigned: - runs-on: macos-12 + runs-on: macos-12-large needs: - test steps: From 688f49a819d8f6220af3c17eb3b9268a675fcafc Mon Sep 17 00:00:00 2001 From: yasserfaraazkhan Date: Tue, 13 Feb 2024 03:02:38 +0530 Subject: [PATCH 6/7] test macos-13-xlarge and ruby 2.7.8 --- .github/actions/prepare-mobile-build/action.yaml | 2 +- .github/workflows/build-pr.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/prepare-mobile-build/action.yaml b/.github/actions/prepare-mobile-build/action.yaml index d45291dad..9f27f76be 100644 --- a/.github/actions/prepare-mobile-build/action.yaml +++ b/.github/actions/prepare-mobile-build/action.yaml @@ -6,7 +6,7 @@ runs: steps: - uses: ruby/setup-ruby@9669f3ee51dc3f4eda8447ab696b3ab19a90d14b # v1.144.0 with: - ruby-version: "2.7.7" + ruby-version: "2.7.8" - name: ci/setup-fastlane-dependencies shell: bash diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 40e869479..af6e3f721 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -22,7 +22,7 @@ jobs: uses: ./.github/actions/test build-ios-pr: - runs-on: macos-12-large + runs-on: macos-13-xlarge if: ${{ github.event.label.name == 'Build Apps for PR' || github.event.label.name == 'Build App for iOS' }} needs: - test From c1358371db9b06931c2cc7fc25158807b3216b1e Mon Sep 17 00:00:00 2001 From: yasserfaraazkhan Date: Tue, 13 Feb 2024 08:34:54 +0530 Subject: [PATCH 7/7] Revert "test macos-13-xlarge and ruby 2.7.8" This reverts commit 688f49a819d8f6220af3c17eb3b9268a675fcafc. --- .github/actions/prepare-mobile-build/action.yaml | 2 +- .github/workflows/build-pr.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/prepare-mobile-build/action.yaml b/.github/actions/prepare-mobile-build/action.yaml index 9f27f76be..d45291dad 100644 --- a/.github/actions/prepare-mobile-build/action.yaml +++ b/.github/actions/prepare-mobile-build/action.yaml @@ -6,7 +6,7 @@ runs: steps: - uses: ruby/setup-ruby@9669f3ee51dc3f4eda8447ab696b3ab19a90d14b # v1.144.0 with: - ruby-version: "2.7.8" + ruby-version: "2.7.7" - name: ci/setup-fastlane-dependencies shell: bash diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index af6e3f721..40e869479 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -22,7 +22,7 @@ jobs: uses: ./.github/actions/test build-ios-pr: - runs-on: macos-13-xlarge + runs-on: macos-12-large if: ${{ github.event.label.name == 'Build Apps for PR' || github.event.label.name == 'Build App for iOS' }} needs: - test