Skip to content

Commit 01a77db

Browse files
committed
Update CI workflows to use Ubuntu 22.04 and upgrade action versions
Signed-off-by: xiaoming <quardxiaoming@gmail.com>
1 parent 20ae63b commit 01a77db

8 files changed

Lines changed: 91 additions & 58 deletions

File tree

.github/workflows/android.yml

Lines changed: 35 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ on:
1717

1818
jobs:
1919
quard_star_tools_android_build:
20-
runs-on: ubuntu-20.04
20+
runs-on: ubuntu-22.04
2121
steps:
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v6
2323

2424
- name: Install prerequisites
2525
shell: bash -l {0}
@@ -31,15 +31,16 @@ jobs:
3131
uses: jurplel/install-qt-action@v4
3232
with:
3333
version: '6.5.3'
34-
modules: 'qt5compat qtwebsockets'
35-
aqtversion: ==3.1.7
34+
modules: 'qt5compat qtwebsockets qtmultimedia'
35+
aqtversion: '==3.1.*'
3636

3737
- name: Install Qt android
3838
uses: jurplel/install-qt-action@v4
3939
with:
4040
version: '6.5.3'
4141
modules: 'qt5compat qtwebsockets qtmultimedia'
42-
aqtversion: ==3.1.7
42+
aqtversion: '==3.1.*'
43+
host: 'linux'
4344
target: 'android'
4445
arch: 'android_arm64_v8a'
4546

@@ -49,25 +50,52 @@ jobs:
4950
run: |
5051
curl -O "https://dl.google.com/android/repository/android-ndk-r25b-linux.zip"
5152
unzip "android-ndk-r25b-linux.zip"
53+
54+
- name: Set up JDK 17
55+
uses: actions/setup-java@v5
56+
with:
57+
distribution: 'temurin'
58+
java-version: '17'
59+
60+
- name: Set up Android SDK Command Line Tools
61+
run: |
62+
ANDROID_SDK_ROOT=$HOME/android-sdk
63+
mkdir -p $ANDROID_SDK_ROOT
64+
wget https://dl.google.com/android/repository/commandlinetools-linux-10406996_latest.zip -O cmdline-tools.zip
65+
unzip -q cmdline-tools.zip -d $ANDROID_SDK_ROOT/cmdline-tools
66+
mv $ANDROID_SDK_ROOT/cmdline-tools/cmdline-tools $ANDROID_SDK_ROOT/cmdline-tools/latest
67+
export PATH=$ANDROID_SDK_ROOT/cmdline-tools/latest/bin:$PATH
68+
export ANDROID_HOME=$ANDROID_SDK_ROOT
69+
echo $PATH
70+
- name: Install required SDK components
71+
run: |
72+
export ANDROID_SDK_ROOT=$HOME/android-sdk
73+
export PATH=$ANDROID_SDK_ROOT/cmdline-tools/latest/bin:$PATH
74+
yes | sdkmanager --licenses
75+
sdkmanager --sdk_root=$ANDROID_SDK_ROOT "platform-tools" "platforms;android-33" "platforms;android-36-ext19"
5276
5377
- name: Build all
5478
shell: bash -l {0}
5579
env:
5680
QT_VERSION: 6.5.3
5781
run: |
82+
export ANDROID_SDK_ROOT=$HOME/android-sdk
83+
export ANDROID_HOME=$HOME/android-sdk
84+
export PATH=$ANDROID_SDK_ROOT/cmdline-tools/latest/bin:$PATH
5885
export ANDROID_NDK_ROOT=$(pwd)/android-ndk-r25b
5986
export ANDROID_BUILD_DIR=$(pwd)/android-build
87+
yes | sdkmanager --licenses
6088
cd quard_star_tools
6189
git describe --always --long --abbrev=10 --exclude '*' | awk '{print "\""$0"\""}' > git_tag.inc
6290
sed -i 's/git_tag.inc/git_tag.ci.inc/g' quard_star_tools.pro
6391
lrelease quard_star_tools.pro
6492
${QT_ROOT_DIR}/bin/qmake -makefile
6593
make
66-
make apk
94+
make apk --verbose
6795
mv android-build/quard_star_tools.apk ../
6896
6997
- name: Upload build asserts
70-
uses: actions/upload-artifact@v4
98+
uses: actions/upload-artifact@v6
7199
with:
72100
name: quard_star_tools_android
73101
path: |

.github/workflows/app_ci.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,16 @@ on:
1717

1818
jobs:
1919
main_build:
20-
runs-on: ubuntu-20.04
20+
runs-on: ubuntu-22.04
2121
timeout-minutes: 360
2222
steps:
23-
- uses: actions/checkout@v4
24-
23+
- uses: actions/checkout@v6
2524

2625

26+
- uses: actions/setup-python@v6
27+
with:
28+
python-version: '3.8'
29+
2730
- name: Install prerequisites
2831
shell: bash -l {0}
2932
run: |
@@ -42,7 +45,7 @@ jobs:
4245
conda install mako
4346
4447
- name: Cache toolchain
45-
uses: actions/cache@v4
48+
uses: actions/cache@v5
4649
env:
4750
cache-name: cache-toolchain
4851
with:
@@ -542,14 +545,14 @@ jobs:
542545
mv target_sysroot.tar.gz ../target_sysroot.tar.gz
543546
544547
- name: Upload build asserts
545-
uses: actions/upload-artifact@v4
548+
uses: actions/upload-artifact@v6
546549
with:
547550
name: target_sysroot
548551
path: |
549552
target_sysroot.tar.gz
550553
551554
#- name: Upload build asserts
552-
# uses: actions/upload-artifact@v4
555+
# uses: actions/upload-artifact@v6
553556
# with:
554557
# name: host_tools
555558
# path: |

.github/workflows/ios.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ on:
1717

1818
jobs:
1919
quard_star_tools_ios_build:
20-
runs-on: macos-13
20+
runs-on: macos-15
2121
steps:
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v6
2323

2424
- name: Install Qt
2525
uses: jurplel/install-qt-action@v4
@@ -53,7 +53,7 @@ jobs:
5353
mv ./IPAFolder/quard_star_tools.ipa ../
5454
5555
- name: Upload build asserts
56-
uses: actions/upload-artifact@v4
56+
uses: actions/upload-artifact@v6
5757
with:
5858
name: quard_star_tools_ios
5959
path: |

.github/workflows/linux.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ on:
99

1010
jobs:
1111
release_linux:
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-22.04
1313
if: github.event.workflow_run.conclusion == 'success'
1414
steps:
15-
- uses: dawidd6/action-download-artifact@v7
15+
- uses: dawidd6/action-download-artifact@v11
1616
with:
1717
workflow: main_ci.yml
1818
workflow_conclusion: success
1919
name: output
2020

21-
- uses: dawidd6/action-download-artifact@v7
21+
- uses: dawidd6/action-download-artifact@v11
2222
with:
2323
workflow: main_ci.yml
2424
workflow_conclusion: success
@@ -51,17 +51,17 @@ jobs:
5151
tar -czf release_linux.tar.gz gui_tools/ update_tools/ output/ run.sh update_tools.sh run_quard_star_tools.sh
5252
5353
- name: Upload build asserts
54-
uses: actions/upload-artifact@v4
54+
uses: actions/upload-artifact@v6
5555
with:
5656
name: release_linux
5757
path: |
5858
release_linux.tar.gz
5959
6060
test_linux:
61-
runs-on: ubuntu-20.04
61+
runs-on: ubuntu-22.04
6262
needs: [release_linux]
6363
steps:
64-
- uses: actions/download-artifact@v4
64+
- uses: actions/download-artifact@v7
6565
with:
6666
name: release_linux
6767

.github/workflows/macos.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,26 @@ on:
99

1010
jobs:
1111
release_macos:
12-
runs-on: macos-13
12+
runs-on: macos-15
1313
if: github.event.workflow_run.conclusion == 'success'
1414
steps:
1515
- name: Install prerequisites
1616
run: |
1717
brew install create-dmg
1818
19-
- uses: dawidd6/action-download-artifact@v7
19+
- uses: dawidd6/action-download-artifact@v11
2020
with:
2121
workflow: main_ci.yml
2222
workflow_conclusion: success
2323
name: output
2424

25-
- uses: dawidd6/action-download-artifact@v7
25+
- uses: dawidd6/action-download-artifact@v11
2626
with:
2727
workflow: main_ci.yml
2828
workflow_conclusion: success
2929
name: qemu_macos
3030

31-
- uses: dawidd6/action-download-artifact@v7
31+
- uses: dawidd6/action-download-artifact@v11
3232
with:
3333
workflow: main_ci.yml
3434
workflow_conclusion: success
@@ -73,17 +73,17 @@ jobs:
7373
tar -czf release_macos.tar.gz quard_star_tools.app
7474
7575
- name: Upload build asserts
76-
uses: actions/upload-artifact@v4
76+
uses: actions/upload-artifact@v6
7777
with:
7878
name: release_macos
7979
path: |
8080
release_macos.tar.gz
8181
8282
test_macos:
83-
runs-on: macos-13
83+
runs-on: macos-15
8484
needs: [release_macos]
8585
steps:
86-
- uses: actions/download-artifact@v4
86+
- uses: actions/download-artifact@v7
8787
with:
8888
name: release_macos
8989

.github/workflows/main_ci.yml

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ on:
3131

3232
jobs:
3333
main_build:
34-
runs-on: ubuntu-20.04
34+
runs-on: ubuntu-22.04
3535
steps:
36-
- uses: actions/checkout@v4
36+
- uses: actions/checkout@v6
3737

3838
- name: clean
3939
shell: bash -l {0}
@@ -58,7 +58,7 @@ jobs:
5858
libvirglrenderer-dev libsdl2-image-dev
5959
6060
- name: Cache toolchain
61-
uses: actions/cache@v4
61+
uses: actions/cache@v5
6262
env:
6363
cache-name: toolchain
6464
with:
@@ -113,31 +113,33 @@ jobs:
113113
# replace pkexec with sudo for ci
114114
sed -i 's/pkexec/sudo/g' build.sh
115115
export TOOLCHAIN_ROOT_PATH=$HOME
116+
# free up some space
117+
rm -rf ./.git
116118
./build.sh all
117119
# perupload
118120
sudo rm -rf ./output/rootfs/bootfs ./output/rootfs/rootfs ./output/rootfs/target
119121
tar -czf output.tar.gz output/ update_tools/ run.sh update_tools.sh
120122
tar -czf toolchain.tar.gz $HOME/gcc-riscv64-unknown-linux-gnu $HOME/gcc-riscv64-unknown-elf
121123
122124
- name: Upload build asserts
123-
uses: actions/upload-artifact@v4
125+
uses: actions/upload-artifact@v6
124126
with:
125127
name: output
126128
path: |
127129
output.tar.gz
128130
retention-days: 1
129131

130132
- name: Upload prebuilt toolchain
131-
uses: actions/upload-artifact@v4
133+
uses: actions/upload-artifact@v6
132134
with:
133135
name: prebuilt_toolchain
134136
path: |
135137
toolchain.tar.gz
136138
137139
qemu_w64_build:
138-
runs-on: ubuntu-20.04
140+
runs-on: ubuntu-22.04
139141
steps:
140-
- uses: actions/checkout@v4
142+
- uses: actions/checkout@v6
141143

142144
- name: clean
143145
shell: bash -l {0}
@@ -158,8 +160,8 @@ jobs:
158160
run: |
159161
dnf update -y
160162
dnf install -y zstd wget
161-
wget https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-libslirp-4.7.0-1-any.pkg.tar.zst
162-
tar -I zstd -xvf mingw-w64-x86_64-libslirp-4.7.0-1-any.pkg.tar.zst
163+
wget https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-libslirp-4.7.0-2-any.pkg.tar.zst
164+
tar -I zstd -xvf mingw-w64-x86_64-libslirp-4.7.0-2-any.pkg.tar.zst
163165
cp ./mingw64/bin/libslirp-0.dll /usr/x86_64-w64-mingw32/sys-root/mingw/bin/libslirp-0.dll
164166
mkdir /usr/x86_64-w64-mingw32/sys-root/mingw/include/slirp
165167
cp ./mingw64/include/slirp/libslirp-version.h /usr/x86_64-w64-mingw32/sys-root/mingw/include/slirp/libslirp-version.h
@@ -171,7 +173,7 @@ jobs:
171173
cp /usr/x86_64-w64-mingw32/sys-root/mingw/bin/*.dll ./output/qemu_w64/
172174
173175
- name: Upload build asserts
174-
uses: actions/upload-artifact@v4
176+
uses: actions/upload-artifact@v6
175177
with:
176178
name: qemu_w64
177179
path: |
@@ -180,9 +182,9 @@ jobs:
180182
retention-days: 1
181183

182184
qemu_macos_build:
183-
runs-on: macos-13
185+
runs-on: macos-15
184186
steps:
185-
- uses: actions/checkout@v4
187+
- uses: actions/checkout@v6
186188

187189
- name: clean
188190
shell: bash -l {0}
@@ -209,17 +211,17 @@ jobs:
209211
tar -czf qemu_macos.tar.gz output/
210212
211213
- name: Upload build asserts
212-
uses: actions/upload-artifact@v4
214+
uses: actions/upload-artifact@v6
213215
with:
214216
name: qemu_macos
215217
path: |
216218
qemu_macos.tar.gz
217219
retention-days: 1
218220

219221
quard_star_tools_build:
220-
runs-on: ubuntu-20.04
222+
runs-on: ubuntu-22.04
221223
steps:
222-
- uses: actions/checkout@v4
224+
- uses: actions/checkout@v6
223225

224226
- name: Install Qt
225227
uses: jurplel/install-qt-action@v4
@@ -262,7 +264,7 @@ jobs:
262264
tar -czf quard_star_tools.tar.gz gui_tools/ run_quard_star_tools.sh
263265
264266
- name: Upload build asserts
265-
uses: actions/upload-artifact@v4
267+
uses: actions/upload-artifact@v6
266268
with:
267269
name: quard_star_tools
268270
path: |
@@ -302,7 +304,7 @@ jobs:
302304
Rename-Item ./release gui_tools
303305
304306
- name: Upload build asserts
305-
uses: actions/upload-artifact@v4
307+
uses: actions/upload-artifact@v6
306308
with:
307309
name: quard_star_tools_w64
308310
path: |
@@ -311,9 +313,9 @@ jobs:
311313
retention-days: 1
312314

313315
quard_star_tools_macos_build:
314-
runs-on: macos-13
316+
runs-on: macos-15
315317
steps:
316-
- uses: actions/checkout@v4
318+
- uses: actions/checkout@v6
317319

318320
- name: Install Qt
319321
uses: jurplel/install-qt-action@v4
@@ -346,7 +348,7 @@ jobs:
346348
tar -czf quard_star_tools.tar.gz gui_tools/
347349
348350
- name: Upload build asserts
349-
uses: actions/upload-artifact@v4
351+
uses: actions/upload-artifact@v6
350352
with:
351353
name: quard_star_tools_macos
352354
path: |

0 commit comments

Comments
 (0)