Skip to content

Commit 1bbb81b

Browse files
satoshiotomakanSergei Boiko
andauthored
fix(CI): Update MacOS to 15 explicitly for iOS CI (trustwallet#4461)
* test(ci): Print all work schemas * test(ci): Manually update macos to 15 * test(ci): Clean up Podfile.lock * test(ci): Use iOS 18.5 simulator * test(ci): Fix iOS device * fix(ci): Enale all CIs * fix(ci): Downgrade objectVersion to 56 * fix(ci): Try to use new SONAR_TOKEN * fix(ci): Use macos-latest-xlarge * fix(ci): Disable SonarCloud analysis temporarily * fix(ci): Add `xcodegen` script * fix(ci): Fix `xcodegen` script * chore(ci): Trigger build * fix(ci): Minor changes --------- Co-authored-by: Sergei Boiko <[email protected]>
1 parent 6e72fe2 commit 1bbb81b

File tree

5 files changed

+31
-8
lines changed

5 files changed

+31
-8
lines changed

.github/workflows/linux-ci-sonarcloud.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ concurrency:
1212

1313
jobs:
1414
build:
15-
if: github.event.pull_request.draft == false && github.event.pull_request.head.repo.fork == false
15+
# if: github.event.pull_request.draft == false
16+
# Temporarily disabled due to issues with SonarCloud account.
17+
if: false
1618
runs-on: ubuntu-24.04
1719
steps:
1820
- uses: actions/checkout@v3

swift/Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ SPEC REPOS:
1111
SPEC CHECKSUMS:
1212
WalletCoreSwiftProtobuf: a4798576a2d309511fc45f81843d348732ec571d
1313

14-
PODFILE CHECKSUM: 1112f54f83017d2c0c1d9d4bf5c21f65c5187d0e
14+
PODFILE CHECKSUM: bbbccdbb7b3665e060820f476dbf21d5b1f8e605
1515

1616
COCOAPODS: 1.16.2

tools/generate-files

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,7 @@ fi
8888

8989
# Generate Xcode project
9090
if [ -x "$(command -v xcodegen)" ] && isTargetSpecified "ios"; then
91-
pushd swift
92-
xcodegen
93-
pod install
94-
popd
91+
tools/xcodegen
9592
elif isTargetSpecified "ios"; then
9693
echo -e "\nWARNING: Skipped generating Xcode project because the xcodegen tool is not installed."
9794
else

tools/ios-test

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
set -e
66
set -o pipefail
77

8+
tools/xcodegen
9+
810
pushd swift
911

10-
xcodegen && pod install
1112
xcodebuild -workspace TrustWalletCore.xcworkspace \
1213
-scheme WalletCore \
1314
-sdk iphonesimulator \
14-
-destination "platform=iOS Simulator,name=iPhone 15,OS=17.2" \
15+
-destination "platform=iOS Simulator,name=iPhone 16,OS=18.5" \
1516
test | xcbeautify
1617

1718
popd

tools/xcodegen

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#!/bin/bash
2+
#
3+
# This script generates the Xcode project using xcodegen.
4+
5+
pushd swift
6+
7+
xcodegen
8+
9+
# Update project version from 70 to 56
10+
# This is a workaround for a bug in xcodegen 2.44.0 that causes pod install will fail with error:
11+
# ArgumentError - [Xcodeproj] Unable to find compatibility version string for object version `70`.
12+
echo "Updating project version from 70 to 56..."
13+
find . -name "project.pbxproj" -type f | while read -r file; do
14+
if grep -q "objectVersion = 70;" "$file" || grep -q "preferredProjectObjectVersion = 70;" "$file"; then
15+
sed -i '' 's/objectVersion = 70;/objectVersion = 56;/g' "$file"
16+
sed -i '' 's/preferredProjectObjectVersion = 70;/preferredProjectObjectVersion = 56;/g' "$file"
17+
echo "✓ project.pbxproj objectVersion in $file to 56"
18+
fi
19+
done
20+
21+
pod install
22+
23+
popd

0 commit comments

Comments
 (0)