From c0b2c957e14279d1a2206fe0e71e2ddd92e75d32 Mon Sep 17 00:00:00 2001 From: Mario Vitale Date: Thu, 22 Feb 2024 11:35:56 +0100 Subject: [PATCH] CLD-7165 Bump MacOS runner version (#7828) * CLD-7165 Bump MacOS runner version * Bump Ruby version * Adapt pipelines to utilize the ruby version in .ruby-version --------- Co-authored-by: Daniel Espino --- .github/actions/prepare-ios-build/action.yaml | 2 +- .github/actions/prepare-mobile-build/action.yaml | 5 ++--- .github/workflows/build-ios-beta.yml | 4 ++-- .github/workflows/build-ios-release.yml | 4 ++-- .github/workflows/build-pr.yml | 2 +- .github/workflows/github-release.yml | 6 ++---- .ruby-version | 2 +- .solidarity | 2 +- ios/Mattermost.xcodeproj/project.pbxproj | 5 ++++- ios/Podfile.lock | 16 ++++++++-------- package-lock.json | 2 +- 11 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/actions/prepare-ios-build/action.yaml b/.github/actions/prepare-ios-build/action.yaml index 9c4a1dbb7..2f34a90a9 100644 --- a/.github/actions/prepare-ios-build/action.yaml +++ b/.github/actions/prepare-ios-build/action.yaml @@ -19,7 +19,7 @@ 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::" diff --git a/.github/actions/prepare-mobile-build/action.yaml b/.github/actions/prepare-mobile-build/action.yaml index d45291dad..5fdccce0d 100644 --- a/.github/actions/prepare-mobile-build/action.yaml +++ b/.github/actions/prepare-mobile-build/action.yaml @@ -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 diff --git a/.github/workflows/build-ios-beta.yml b/.github/workflows/build-ios-beta.yml index 7921bda3e..f08c815d4 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-large + runs-on: macos-14-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-large + runs-on: macos-14-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 3d349f1af..33034450b 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-large + runs-on: macos-14-large if: ${{ !contains(github.ref_name, 'release-sim') }} needs: - test @@ -71,7 +71,7 @@ jobs: path: "*.ipa" build-ios-simulator: - runs-on: macos-12-large + runs-on: macos-14-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 40e869479..1dbfc5bad 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-14-large if: ${{ github.event.label.name == 'Build Apps for PR' || github.event.label.name == 'Build App for iOS' }} needs: - test diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml index eede23975..a888ad588 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-large + runs-on: macos-14-large needs: - test steps: @@ -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 diff --git a/.ruby-version b/.ruby-version index 6a81b4c83..818bd47ab 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.8 +3.0.6 diff --git a/.solidarity b/.solidarity index 86245c2df..f7aa6366b 100644 --- a/.solidarity +++ b/.solidarity @@ -32,7 +32,7 @@ { "rule": "cli", "binary": "ruby", - "semver": ">=2.7.1 <3.0.0", + "semver": ">=3.0.0", "error": "visit rvm install https://rvm.io/rvm/install", "platform": "darwin" }, diff --git a/ios/Mattermost.xcodeproj/project.pbxproj b/ios/Mattermost.xcodeproj/project.pbxproj index b638f66a7..455722850 100644 --- a/ios/Mattermost.xcodeproj/project.pbxproj +++ b/ios/Mattermost.xcodeproj/project.pbxproj @@ -1408,6 +1408,7 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Mattermost/Pods-Mattermost-resources.sh", + "${PODS_ROOT}/CocoaLumberjack/Sources/CocoaLumberjack/PrivacyInfo.xcprivacy", "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf", "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Entypo.ttf", "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf", @@ -1428,10 +1429,12 @@ "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf", "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Zocial.ttf", "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.bundle", "${PODS_ROOT}/Sentry/Sources/Resources/PrivacyInfo.xcprivacy", ); name = "[CP] Copy Pods Resources"; outputPaths = ( + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/PrivacyInfo.xcprivacy", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AntDesign.ttf", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Entypo.ttf", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EvilIcons.ttf", @@ -1452,7 +1455,7 @@ "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SimpleLineIcons.ttf", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Zocial.ttf", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/PrivacyInfo.xcprivacy", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SDWebImage.bundle", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 0bd4b8d26..0801ed0de 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -4,9 +4,9 @@ PODS: - BVLinearGradient (2.8.3): - React-Core - CocoaAsyncSocket (7.6.5) - - CocoaLumberjack (3.8.2): - - CocoaLumberjack/Core (= 3.8.2) - - CocoaLumberjack/Core (3.8.2) + - CocoaLumberjack (3.8.4): + - CocoaLumberjack/Core (= 3.8.4) + - CocoaLumberjack/Core (3.8.4) - DoubleConversion (1.1.6) - FBLazyVector (0.72.7) - FBReactNativeSpec (0.72.7): @@ -644,9 +644,9 @@ PODS: - RNVectorIcons (10.0.2): - RCT-Folly (= 2021.07.22.00) - React-Core - - SDWebImage (5.18.5): - - SDWebImage/Core (= 5.18.5) - - SDWebImage/Core (5.18.5) + - SDWebImage (5.18.11): + - SDWebImage/Core (= 5.18.11) + - SDWebImage/Core (5.18.11) - SDWebImageWebPCoder (0.13.0): - libwebp (~> 1.0) - SDWebImage/Core (~> 5.17) @@ -985,7 +985,7 @@ SPEC CHECKSUMS: boost: 57d2868c099736d80fcd648bf211b4431e51a558 BVLinearGradient: 880f91a7854faff2df62518f0281afb1c60d49a3 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 - CocoaLumberjack: f8d89a516e7710fdb2e9b8f1560b16ec6040eef0 + CocoaLumberjack: df59726690390bb8aaaa585938564ba1c8dbbb44 DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 FBLazyVector: 5fbbff1d7734827299274638deb8ba3024f6c597 FBReactNativeSpec: 638095fe8a01506634d77b260ef8a322019ac671 @@ -1078,7 +1078,7 @@ SPEC CHECKSUMS: RNShare: bed7c4fbe615f3d977f22feb0902af9a790c1660 RNSVG: 255767813dac22db1ec2062c8b7e7b856d4e5ae6 RNVectorIcons: 23b6e11af4aaf104d169b1b0afa7e5cf96c676ce - SDWebImage: 7ac2b7ddc5e8484c79aa90fc4e30b149d6a2c88f + SDWebImage: a3ba0b8faac7228c3c8eadd1a55c9c9fe5e16457 SDWebImageWebPCoder: af09429398d99d524cae2fe00f6f0f6e491ed102 Sentry: 6f5742b4c47c17c9adcf265f6f328cf4a0ed1923 SentryPrivate: b2f7996f37781080f04a946eb4e377ff63c64195 diff --git a/package-lock.json b/package-lock.json index d71627c67..1be994270 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "packages": { "": { "name": "mattermost-mobile", - "version": "2.12.0", + "version": "2.14.0", "hasInstallScript": true, "license": "Apache 2.0", "dependencies": {