Skip to content

Commit d073cda

Browse files
committed
System: update CI scripts
1 parent c3ca213 commit d073cda

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

.github/workflows/android_x86.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Android CI x86
22

3-
on: [push]
3+
on: [pull_request]
44

55
jobs:
66
build:
@@ -20,9 +20,10 @@ jobs:
2020
run: wget https://dl.google.com/android/repository/android-ndk-r17c-darwin-x86_64.zip;
2121
unzip android-ndk-r17c-darwin-x86_64.zip
2222
- name: Install Swift Android Toolchain
23-
run: SWIFT_ANDROID=$(curl -fsSL https://api.bintray.com/packages/readdle/swift-android-toolchain/swift-android-toolchain/versions/_latest | python -c 'import json,sys;print(json.load(sys.stdin))["name"]');
24-
wget https://dl.bintray.com/readdle/swift-android-toolchain/swift-android-$SWIFT_ANDROID.zip;
23+
run: SWIFT_ANDROID=$(curl --silent "https://api.github.com/repos/readdle/swift-android-toolchain/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/');
24+
wget https://github.com/readdle/swift-android-toolchain/releases/latest/download/swift-android-$SWIFT_ANDROID.zip;
2525
unzip swift-android-$SWIFT_ANDROID.zip;
26+
rm -rf swift-android-$SWIFT_ANDROID.zip;
2627
swift-android-$SWIFT_ANDROID/bin/swift-android tools --update;
2728
ln -sfn swift-android-$SWIFT_ANDROID swift-android-current
2829
- name: Download Android Emulator

.github/workflows/android_x86_64.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Android CI x86_64
22

3-
on: [push]
3+
on: [pull_request]
44

55
jobs:
66
build:
@@ -20,9 +20,10 @@ jobs:
2020
run: wget https://dl.google.com/android/repository/android-ndk-r17c-darwin-x86_64.zip;
2121
unzip android-ndk-r17c-darwin-x86_64.zip
2222
- name: Install Swift Android Toolchain
23-
run: SWIFT_ANDROID=$(curl -fsSL https://api.bintray.com/packages/readdle/swift-android-toolchain/swift-android-toolchain/versions/_latest | python -c 'import json,sys;print(json.load(sys.stdin))["name"]');
24-
wget https://dl.bintray.com/readdle/swift-android-toolchain/swift-android-$SWIFT_ANDROID.zip;
23+
run: SWIFT_ANDROID=$(curl --silent "https://api.github.com/repos/readdle/swift-android-toolchain/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/');
24+
wget https://github.com/readdle/swift-android-toolchain/releases/latest/download/swift-android-$SWIFT_ANDROID.zip;
2525
unzip swift-android-$SWIFT_ANDROID.zip;
26+
rm -rf swift-android-$SWIFT_ANDROID.zip;
2627
swift-android-$SWIFT_ANDROID/bin/swift-android tools --update;
2728
ln -sfn swift-android-$SWIFT_ANDROID swift-android-current
2829
- name: Download Android Emulator

0 commit comments

Comments
 (0)