Skip to content

Commit eeac6a9

Browse files
sstonesstone
authored
Update CI scripts (#112)
* Update CI scripts * CI: use jdk 17 * CI: run Android tests on ubuntu
1 parent 567f411 commit eeac6a9

File tree

3 files changed

+86
-32
lines changed

3 files changed

+86
-32
lines changed

‎.github/workflows/release.yml‎

Lines changed: 35 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,20 @@ jobs:
1616
uses: actions/checkout@v2
1717
with:
1818
submodules: 'true'
19+
- name: Enable KVM
20+
if: matrix.os == 'ubuntu-latest'
21+
run: |
22+
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
23+
sudo udevadm control --reload-rules
24+
sudo udevadm trigger --name-match=kvm
1925
- name: Cached Konan
20-
uses: actions/cache@v2
26+
uses: actions/cache@v4
2127
with:
2228
path: ~/.konan
2329
key: ${{ runner.os }}-konan-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
2430
restore-keys: ${{ runner.os }}-konan-
2531
- name: Cached Gradle
26-
uses: actions/cache@v2
32+
uses: actions/cache@v4
2733
with:
2834
path: ~/.gradle
2935
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
@@ -36,7 +42,7 @@ jobs:
3642
echo "ANDROID_NDK_VERSION=25.2.9519653" >> $GITHUB_ENV
3743
- name: Cached Android NDK
3844
if: matrix.os != 'windows-latest'
39-
uses: actions/cache@v2
45+
uses: actions/cache@v4
4046
with:
4147
path: ${{ format('{0}/ndk/{1}', env.ANDROID_HOME, env.ANDROID_NDK_VERSION) }}
4248
key: ${{ runner.os }}-android-ndk-${{ env.ANDROID_NDK_VERSION }}
@@ -47,7 +53,7 @@ jobs:
4753
rm.exe "C:/WINDOWS/system32/bash.EXE"
4854
- name: Install Automake
4955
if: matrix.os == 'macOS-latest'
50-
run: brew install automake
56+
run: brew install automake libtool
5157
- name: Install Automake (windows)
5258
if: matrix.os == 'windows-latest'
5359
uses: msys2/setup-msys2@v2
@@ -69,9 +75,10 @@ jobs:
6975
run: |
7076
echo "skip.android=true" > local.properties
7177
- name: Set up JDK 11
72-
uses: actions/setup-java@v1
78+
uses: actions/setup-java@v4
7379
with:
74-
java-version: 11
80+
java-version: 17
81+
distribution: 'adopt'
7582
- name: Check JVM
7683
if: matrix.os != 'windows-latest'
7784
run: ./gradlew jvmTest
@@ -88,7 +95,7 @@ jobs:
8895
shell: bash
8996
run: ./gradlew iosX64Test
9097
- name: Check Android
91-
if: matrix.os == 'macOS-latest'
98+
if: matrix.os == 'ubuntu-latest'
9299
uses: reactivecircus/android-emulator-runner@v2
93100
with:
94101
api-level: 27
@@ -99,7 +106,7 @@ jobs:
99106
- name: Publish Linux
100107
if: matrix.os == 'ubuntu-latest'
101108
shell: bash
102-
run: ./gradlew publishLinuxX64PublicationToMavenLocal :jni:jvm:linux:publishJvmPublicationToMavenLocal
109+
run: ./gradlew publishAndroidPublicationToMavenLocal publishLinuxX64PublicationToMavenLocal :jni:jvm:linux:publishJvmPublicationToMavenLocal
103110
- name: Publish Windows
104111
if: matrix.os == 'windows-latest'
105112
shell: msys2 {0}
@@ -112,10 +119,27 @@ jobs:
112119
run: |
113120
mkdir -p maven-local/release
114121
cp -r ~/.m2/repository/* maven-local/release
115-
- name: Upload artifacts
116-
uses: actions/upload-artifact@v2
122+
- name: Upload linux artifacts
123+
if: matrix.os == 'ubuntu-latest'
124+
uses: actions/upload-artifact@v4
125+
with:
126+
name: release-linux
127+
path: |
128+
maven-local
129+
!maven-local/**/maven-metadata-local.xml
130+
- name: Upload macos artifacts
131+
if: matrix.os == 'macOS-latest'
132+
uses: actions/upload-artifact@v4
117133
with:
118-
name: release
134+
name: release-macos
119135
path: |
120136
maven-local
121137
!maven-local/**/maven-metadata-local.xml
138+
- name: Upload windows artifacts
139+
if: matrix.os == 'windows-latest'
140+
uses: actions/upload-artifact@v4
141+
with:
142+
name: release-windows
143+
path: |
144+
maven-local
145+
!maven-local/**/maven-metadata-local.xml

‎.github/workflows/snapshot.yml‎

Lines changed: 36 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,23 @@ jobs:
2222
os: [ubuntu-latest, macOS-latest, windows-latest]
2323
steps:
2424
- name: Check out
25-
uses: actions/checkout@v2
25+
uses: actions/checkout@v4
2626
with:
2727
submodules: 'true'
28+
- name: Enable KVM
29+
if: matrix.os == 'ubuntu-latest'
30+
run: |
31+
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
32+
sudo udevadm control --reload-rules
33+
sudo udevadm trigger --name-match=kvm
2834
- name: Cached Konan
29-
uses: actions/cache@v2
35+
uses: actions/cache@v4
3036
with:
3137
path: ~/.konan
3238
key: ${{ runner.os }}-konan-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
3339
restore-keys: ${{ runner.os }}-konan-
3440
- name: Cached Gradle
35-
uses: actions/cache@v2
41+
uses: actions/cache@v4
3642
with:
3743
path: ~/.gradle
3844
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
@@ -45,7 +51,7 @@ jobs:
4551
echo "ANDROID_NDK_VERSION=25.2.9519653" >> $GITHUB_ENV
4652
- name: Cached Android NDK
4753
if: matrix.os != 'windows-latest'
48-
uses: actions/cache@v2
54+
uses: actions/cache@v4
4955
with:
5056
path: ${{ format('{0}/ndk/{1}', env.ANDROID_HOME, env.ANDROID_NDK_VERSION) }}
5157
key: ${{ runner.os }}-android-ndk-${{ env.ANDROID_NDK_VERSION }}
@@ -56,7 +62,7 @@ jobs:
5662
rm.exe "C:/WINDOWS/system32/bash.EXE"
5763
- name: Install Automake
5864
if: matrix.os == 'macOS-latest'
59-
run: brew install automake
65+
run: brew install automake libtool
6066
- name: Install Automake (windows)
6167
if: matrix.os == 'windows-latest'
6268
uses: msys2/setup-msys2@v2
@@ -78,9 +84,10 @@ jobs:
7884
run: |
7985
echo "skip.android=true" > local.properties
8086
- name: Set up JDK 11
81-
uses: actions/setup-java@v1
87+
uses: actions/setup-java@v4
8288
with:
83-
java-version: 11
89+
java-version: 17
90+
distribution: 'adopt'
8491
- name: Check JVM
8592
if: matrix.os != 'windows-latest'
8693
run: ./gradlew jvmTest
@@ -97,7 +104,7 @@ jobs:
97104
shell: bash
98105
run: ./gradlew iosX64Test
99106
- name: Check Android
100-
if: matrix.os == 'macOS-latest'
107+
if: matrix.os == 'ubuntu-latest'
101108
uses: reactivecircus/android-emulator-runner@v2
102109
with:
103110
api-level: 27
@@ -108,7 +115,7 @@ jobs:
108115
- name: Publish Linux
109116
if: matrix.os == 'ubuntu-latest'
110117
shell: bash
111-
run: ./gradlew publishLinuxX64PublicationToMavenLocal :jni:jvm:linux:publishJvmPublicationToMavenLocal -PsnapshotNumber=${{ github.run_number }} -PgitRef=${{ github.ref }}
118+
run: ./gradlew publishAndroidPublicationToMavenLocal publishLinuxX64PublicationToMavenLocal :jni:jvm:linux:publishJvmPublicationToMavenLocal -PsnapshotNumber=${{ github.run_number }} -PgitRef=${{ github.ref }}
112119
- name: Publish Windows
113120
if: matrix.os == 'windows-latest'
114121
shell: msys2 {0}
@@ -121,11 +128,27 @@ jobs:
121128
run: |
122129
mkdir -p maven-local/snapshot
123130
cp -r ~/.m2/repository/* maven-local/snapshot
124-
- name: Upload artifacts
125-
uses: actions/upload-artifact@v2
131+
- name: Upload linux artifacts
132+
if: matrix.os == 'ubuntu-latest'
133+
uses: actions/upload-artifact@v4
126134
with:
127-
name: snapshot
135+
name: snapshot-linux
128136
path: |
129137
maven-local
130138
!maven-local/**/maven-metadata-local.xml
131-
139+
- name: Upload macos artifacts
140+
if: matrix.os == 'macOS-latest'
141+
uses: actions/upload-artifact@v4
142+
with:
143+
name: snapshot-macos
144+
path: |
145+
maven-local
146+
!maven-local/**/maven-metadata-local.xml
147+
- name: Upload windows artifacts
148+
if: matrix.os == 'windows-latest'
149+
uses: actions/upload-artifact@v4
150+
with:
151+
name: snapshot-windows
152+
path: |
153+
maven-local
154+
!maven-local/**/maven-metadata-local.xml

‎.github/workflows/test.yml‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,23 @@ jobs:
2828
os: [ubuntu-latest, macOS-latest, windows-latest]
2929
steps:
3030
- name: Check out
31-
uses: actions/checkout@v2
31+
uses: actions/checkout@v4
3232
with:
3333
submodules: 'true'
34+
- name: Enable KVM
35+
if: matrix.os == 'ubuntu-latest'
36+
run: |
37+
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
38+
sudo udevadm control --reload-rules
39+
sudo udevadm trigger --name-match=kvm
3440
- name: Cached Konan
35-
uses: actions/cache@v2
41+
uses: actions/cache@v4
3642
with:
3743
path: ~/.konan
3844
key: ${{ runner.os }}-konan-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
3945
restore-keys: ${{ runner.os }}-konan-
4046
- name: Cached Gradle
41-
uses: actions/cache@v2
47+
uses: actions/cache@v4
4248
with:
4349
path: ~/.gradle
4450
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
@@ -51,7 +57,7 @@ jobs:
5157
echo "ANDROID_NDK_VERSION=25.2.9519653" >> $GITHUB_ENV
5258
- name: Cached Android NDK
5359
if: matrix.os != 'windows-latest'
54-
uses: actions/cache@v2
60+
uses: actions/cache@v4
5561
with:
5662
path: ${{ format('{0}/ndk/{1}', env.ANDROID_HOME, env.ANDROID_NDK_VERSION) }}
5763
key: ${{ runner.os }}-android-ndk-${{ env.ANDROID_NDK_VERSION }}
@@ -62,7 +68,7 @@ jobs:
6268
rm.exe "C:/WINDOWS/system32/bash.EXE"
6369
- name: Install Automake
6470
if: matrix.os == 'macOS-latest'
65-
run: brew install automake
71+
run: brew install automake libtool
6672
- name: Install Automake (windows)
6773
if: matrix.os == 'windows-latest'
6874
uses: msys2/setup-msys2@v2
@@ -84,9 +90,10 @@ jobs:
8490
run: |
8591
echo "skip.android=true" > local.properties
8692
- name: Set up JDK 11
87-
uses: actions/setup-java@v1
93+
uses: actions/setup-java@v4
8894
with:
89-
java-version: 11
95+
java-version: 17
96+
distribution: 'adopt'
9097
- name: Check JVM
9198
if: matrix.os != 'windows-latest'
9299
run: ./gradlew jvmTest
@@ -103,7 +110,7 @@ jobs:
103110
shell: bash
104111
run: ./gradlew iosX64Test
105112
- name: Check Android
106-
if: matrix.os == 'macOS-latest'
113+
if: matrix.os == 'ubuntu-latest'
107114
uses: reactivecircus/android-emulator-runner@v2
108115
with:
109116
api-level: 27

0 commit comments

Comments
 (0)