diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fea66c9..cb35f46 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -79,7 +79,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: '11' + java-version: '17' - name: Finalize Android SDK if: env.turbo_cache_hit != 1 @@ -102,13 +102,18 @@ jobs: yarn turbo run build:android --cache-dir="${{ env.TURBO_CACHE_DIR }}" build-ios: - runs-on: macos-latest + runs-on: macos-13-xlarge env: TURBO_CACHE_DIR: .turbo/ios + DEVELOPER_DIR: /Applications/Xcode_15.1.app/Contents/Developer steps: - name: Checkout uses: actions/checkout@v3 + - uses: ruby/setup-ruby@v1 + with: + ruby-version: '3.2.2' + - name: Setup uses: ./.github/actions/setup @@ -143,6 +148,7 @@ jobs: if: env.turbo_cache_hit != 1 && steps.cocoapods-cache.outputs.cache-hit != 'true' run: | yarn pod-install example/ios + brew install watchman env: NO_FLIPPER: 1 diff --git a/.gitignore b/.gitignore index d3b53df..f559641 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,7 @@ DerivedData *.ipa *.xcuserstate project.xcworkspace +.xcode.env.local # Android/IJ # diff --git a/example/ios/.xcode.env.local b/example/ios/.xcode.env.local deleted file mode 100644 index 90bf768..0000000 --- a/example/ios/.xcode.env.local +++ /dev/null @@ -1,2 +0,0 @@ -export NODE_BINARY=/Users/kenny.tsui/.nvm/versions/node/v18.16.0/bin/node - diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index bd32b96..3a43933 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1385,4 +1385,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 4b9faf5e512fab6e8d87beb30570ec4d3bd884b9 -COCOAPODS: 1.14.2 +COCOAPODS: 1.14.3