Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CLD-7165 Bump MacOS runner version #7828

Merged
merged 12 commits into from
Feb 22, 2024
9 changes: 8 additions & 1 deletion .github/actions/prepare-ios-build/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,14 @@ runs:
- name: ci/install-pods-dependencies
shell: bash
run: |
echo "::group::install-pods-dependencies"
echo "::group::install-pods-dependencies"
npm run ios-gems
npm run pod-install
echo "::endgroup::"

- name: ci/select-xcode-version
shell: bash
run: |
echo "::group::install-pods-dependencies"
sudo xcode-select --switch /Applications/Xcode_15.2.app
echo "::endgroup::"
5 changes: 2 additions & 3 deletions .github/actions/prepare-mobile-build/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ description: Action to prepare environment for mobile build
runs:
using: composite
steps:
- uses: ruby/setup-ruby@9669f3ee51dc3f4eda8447ab696b3ab19a90d14b # v1.144.0
with:
ruby-version: "2.7.7"
# The required ruby version is mentioned in '.ruby-version'
- uses: ruby/setup-ruby@22fdc77bf4148f810455b226c90fb81b5cbc00a7 # v 1.171.0

- name: ci/setup-fastlane-dependencies
shell: bash
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-ios-beta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
uses: ./.github/actions/test

build-ios-simulator:
runs-on: macos-12-large
runs-on: macos-13-large
mvitale1989 marked this conversation as resolved.
Show resolved Hide resolved
if: ${{ !contains(github.ref_name, 'beta-ios') }}
needs:
- test
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
path: Mattermost-simulator-x86_64.app.zip

build-and-deploy-ios-beta:
runs-on: macos-12-large
runs-on: macos-13-large
if: ${{ !contains(github.ref_name, 'beta-sim') }}
needs:
- test
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-ios-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
uses: ./.github/actions/test

build-and-deploy-ios-release:
runs-on: macos-12-large
runs-on: macos-13-large
if: ${{ !contains(github.ref_name, 'release-sim') }}
needs:
- test
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
path: "*.ipa"

build-ios-simulator:
runs-on: macos-12-large
runs-on: macos-13-large
if: ${{ !contains(github.ref_name , 'release-ios') }}
needs:
- test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
uses: ./.github/actions/test

build-ios-pr:
runs-on: macos-12-large
runs-on: macos-13-large
if: ${{ github.event.label.name == 'Build Apps for PR' || github.event.label.name == 'Build App for iOS' }}
needs:
- test
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/github-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
uses: ./.github/actions/test

build-ios-unsigned:
runs-on: macos-12-large
runs-on: macos-13-large
needs:
- test
steps:
Expand Down Expand Up @@ -82,9 +82,7 @@ jobs:
- name: ci/checkout-repo
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0

- uses: ruby/setup-ruby@9669f3ee51dc3f4eda8447ab696b3ab19a90d14b # v1.144.0
with:
ruby-version: "2.7"
- uses: ruby/setup-ruby@22fdc77bf4148f810455b226c90fb81b5cbc00a7 # v1.171.0

- name: release/setup-fastlane-dependencies
run: bundle install
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.8
3.0.6
237 changes: 0 additions & 237 deletions fastlane/Gemfile.lock
mvitale1989 marked this conversation as resolved.
Show resolved Hide resolved
mvitale1989 marked this conversation as resolved.
Outdated
Show resolved Hide resolved

This file was deleted.

2 changes: 1 addition & 1 deletion ios/Gemfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source "https://rubygems.org"

gem "cocoapods", "1.14.3"
gem "cocoapods", "1.15.2"
mvitale1989 marked this conversation as resolved.
Show resolved Hide resolved