Page MenuHomePhorge

D15220.1765056240.diff
No OneTemporary

Size
2 KB
Referenced Files
None
Subscribers
None

D15220.1765056240.diff

diff --git a/.github/workflows/android_ci.yml b/.github/workflows/android_ci.yml
--- a/.github/workflows/android_ci.yml
+++ b/.github/workflows/android_ci.yml
@@ -48,6 +48,10 @@
- name: Fix node-gyp
run: python -m pip install packaging setuptools
+
+ - name: Install CMake
+ run: |
+ yes | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "cmake;3.18.1"
- name: yarn ci-cleaninstall
run: yarn ci-cleaninstall
@@ -71,4 +75,4 @@
working-directory: ./native/android
env:
ANDROID_SIGNING_PASSWORD: ${{secrets.ANDROID_SIGNING_PASSWORD}}
- run: JAVA_HOME=${JAVA_HOME_11_arm64} ./gradlew bundleRelease
+ run: JAVA_HOME=${JAVA_HOME_17_arm64} ./gradlew bundleRelease
diff --git a/.github/workflows/android_release.yml b/.github/workflows/android_release.yml
--- a/.github/workflows/android_release.yml
+++ b/.github/workflows/android_release.yml
@@ -41,6 +41,10 @@
- name: Fix node-gyp
run: python -m pip install packaging setuptools
+
+ - name: Install CMake
+ run: |
+ yes | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "cmake;3.18.1"
- name: yarn ci-cleaninstall
run: yarn ci-cleaninstall
@@ -76,7 +80,7 @@
working-directory: ./native/android
env:
ANDROID_SIGNING_PASSWORD: ${{secrets.ANDROID_SIGNING_PASSWORD}}
- run: JAVA_HOME=${JAVA_HOME_11_arm64} ./gradlew bundleRelease
+ run: JAVA_HOME=${JAVA_HOME_17_arm64} ./gradlew bundleRelease
- name: Save PLAY_STORE_PUBLISHING_KEY to file
working-directory: ./native/android
diff --git a/postinstall.sh b/postinstall.sh
--- a/postinstall.sh
+++ b/postinstall.sh
@@ -14,5 +14,5 @@
yarn workspace native jetify
if [[ "$OSTYPE" == "darwin"* ]]; then
- (cd native/ios && PATH=/usr/bin:/bin:"$PATH" bundle install && PATH=/usr/bin:/bin:"$PATH" MACOSX_DEPLOYMENT_TARGET='' bundle exec pod install --repo-update)
+ (cd native/ios && bundle install && MACOSX_DEPLOYMENT_TARGET='' bundle exec pod install --repo-update)
fi

File Metadata

Mime Type
text/plain
Expires
Sat, Dec 6, 9:24 PM (20 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5840917
Default Alt Text
D15220.1765056240.diff (2 KB)

Event Timeline