fix ios build on CI (#702)

tonkeeper · Feb 14, 2024 · 0a4aebf · 0a4aebf
1 parent 06422f0
commit 0a4aebf
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -10,7 +10,7 @@ jobs:
       matrix:
         os: [macos-13]
         node-version: [18.18.0]
-        ruby-version: [3.2]
+        ruby-version: [2.7]
         xcode: [15.0.1]
 
     runs-on: ${{ matrix.os }}
@@ -32,16 +32,25 @@ jobs:
           max_attempts: 3
           command: yarn
 
-      - name: Install pods dependencies
-        run: yarn pods
-
       - name: Set up Ruby and Gemfile dependencies
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true
           working-directory: './packages/mobile'
 
+      - name: Cache Pods directory
+        uses: actions/cache@v3
+        with:
+          path: ./packages/mobile/ios/Pods
+          key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-pods-
+
+      - name: Install pods dependencies
+        working-directory: './packages/mobile/ios'
+        run: bundle exec pod install
+
       - name: Decode signing certificate into a file
         working-directory: './packages/mobile/ios'
         env:
@@ -83,7 +92,7 @@ jobs:
       matrix:
         os: [macos-13]
         node-version: [18.18.0]
-        ruby-version: [3.2]
+        ruby-version: [2.7]
         java-version: [11.0.12]
 
     runs-on: ${{ matrix.os }}
@@ -159,7 +168,7 @@ jobs:
       matrix:
         os: [macos-13]
         node-version: [18.18.0]
-        ruby-version: [3.2]
+        ruby-version: [2.7]
         java-version: [11.0.12]
 
     runs-on: ${{ matrix.os }}

diff --git a/packages/mobile/ios/ton_keeper.xcodeproj/project.pbxproj b/packages/mobile/ios/ton_keeper.xcodeproj/project.pbxproj
@@ -1409,11 +1409,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_CPLUSPLUSFLAGS = "$(inherited)";
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					"-Wl",
-					"-ld_classic",
-				);
+				OTHER_LDFLAGS = "$(inherited)";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 			};
@@ -1478,11 +1474,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_CPLUSPLUSFLAGS = "$(inherited)";
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					"-Wl",
-					"-ld_classic",
-				);
+				OTHER_LDFLAGS = "$(inherited)";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;