Skip to content

Commit 9a61c06

Browse files
committed
update ci
1 parent 54341ca commit 9a61c06

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ on:
88

99
env:
1010
FF_VER: master
11-
LLVM_VER: 12
12-
NDK_VERSION: r22b
11+
LLVM_VER: 13
12+
NDK_VERSION: r23
1313
NINJA_STATUS: '[%f/%t %e %r]'
1414
SF_PW: ${{ secrets.SF_PW }}
1515
SF_USER: ${{ secrets.SF_USER }}

ci-before-build.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
LLVER=${LLVM_VER:-12}
1+
LLVER=${LLVM_VER:-13}
22
NDK_HOST=linux
33
FF_EXTRA=-clang
44
FFPKG_EXT=tar.xz
@@ -24,8 +24,8 @@ if [ `which dpkg` ]; then # TODO: multi arch
2424
#sudo apt update
2525
#sudo apt install -y software-properties-common # for add-apt-repository, ubuntu-tooolchain-r-test is required by trusty
2626
#sudo apt-add-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-8 main" # rpi
27-
sudo apt-add-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-12 main"
28-
sudo apt-add-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal main" # clang-13
27+
sudo apt-add-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main"
28+
sudo apt-add-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal main" # clang-14
2929
sudo apt update
3030
fi
3131
if [ "$TARGET_OS" == "linux" ]; then
@@ -117,14 +117,14 @@ if [[ "$SYSROOT_CACHE_HIT" != "true" ]]; then
117117
fi
118118

119119
if [ "$TARGET_OS" == "android" -a ! -d "$ANDROID_NDK_LATEST_HOME" ]; then
120-
wget https://dl.google.com/android/repository/android-ndk-${NDK_VERSION:-r22b}-${NDK_HOST}-x86_64.zip -O ndk.zip
120+
wget https://dl.google.com/android/repository/android-ndk-${NDK_VERSION:-r23}-${NDK_HOST}-x86_64.zip -O ndk.zip
121121
7z x ndk.zip -o/tmp &>/dev/null
122-
mv /tmp/android-ndk-${NDK_VERSION:-r22b} ${ANDROID_NDK:-/tmp/android-ndk}
122+
mv /tmp/android-ndk-${NDK_VERSION:-r23} ${ANDROID_NDK:-/tmp/android-ndk}
123123
fi
124124
fi
125125

126126
if [[ "$EXTERNAL_DEP_CACHE_HIT" != "true" ]]; then
127-
curl -kL -o dav1d.deb "https://www.deb-multimedia.org/pool/main/d/dav1d-dmo/libdav1d-dev_0.9.0-dmo1_armhf.deb"
127+
curl -kL -o dav1d.deb "https://www.deb-multimedia.org/pool/main/d/dav1d-dmo/libdav1d-dev_0.9.2-dmo1_armhf.deb"
128128
7z x -y dav1d.deb
129129
tar xvf data.tar
130130
mv usr/include/dav1d external/include/

0 commit comments

Comments
 (0)