Repair clean-checkout builds and the package-release harness
Install ffmpeg wherever the app build checks the guide narration clips: the check decodes every clip, and only the Test jobs had ffmpeg, so web, Linux, Windows, Android, Snap and F-Droid builds reported all 320 clips as stale. Link the package-release harness and the sync server against the pinned toolchain instead of the removed build/ziran-toolchain, use the current zi2zx command form, resolve the media compression test through package exports, and stage Tai Chi preview voices only for the app's own locales.
This commit is contained in:
1 parent
1a18c5976a
commit
7fbef85924
22 files changed
+52
-26
No files matched your search
@@ -3,3 +3,5 @@ nasm
|
||||
# dav1d (the AVIF decoder) builds with Meson and Ninja.
|
||||
meson
|
||||
ninja-build
|
||||
# The app build decodes every guide narration clip with ffmpeg to check it.
|
||||
ffmpeg
|
||||
@@ -31,3 +31,5 @@ nasm
|
||||
# dav1d (the AVIF decoder) builds with Meson and Ninja.
|
||||
meson
|
||||
ninja-build
|
||||
# The app build decodes every guide narration clip with ffmpeg to check it.
|
||||
ffmpeg
|
||||
@@ -3,3 +3,5 @@ zlib1g-dev
|
||||
zip
|
||||
tcl
|
||||
python3-fonttools
|
||||
# The app build decodes every guide narration clip with ffmpeg to check it.
|
||||
ffmpeg
|
||||
@@ -10,3 +10,5 @@ nasm
|
||||
# dav1d (the AVIF decoder) builds with Meson and Ninja.
|
||||
meson
|
||||
ninja-build
|
||||
# The app build decodes every guide narration clip with ffmpeg to check it.
|
||||
ffmpeg
|
||||
@@ -22,8 +22,8 @@ fi
|
||||
# Emscripten's PATH entry holds a cmake directory, which make's own command
|
||||
# lookup would try to run instead of the cmake program. The server generates
|
||||
# its Go with Ziran, Breeze's own toolchain.
|
||||
make /src/build/ziran-toolchain/bin/zi2c
|
||||
make /src/build/packages/ziran/build/bin/zi2c
|
||||
make -C "$server" BUILD_DIR="$server/build" CMAKE="$(command -v cmake)" \
|
||||
ZIRAN=/src/build/ziran-toolchain/bin/ziran build
|
||||
ZIRAN=/src/build/packages/ziran/build/bin/ziran build
|
||||
DAOCHI_BIN="$server/daochi" make sync-server-test
|
||||
git -c safe.directory="$server" -C "$server" diff --exit-code "$commit" -- .
|
||||
@@ -172,8 +172,8 @@ jobs:
|
||||
if: matrix.shard == 0
|
||||
run: |
|
||||
# The server generates its Go with Ziran, Breeze's own toolchain.
|
||||
make "$GITHUB_WORKSPACE/build/ziran-toolchain/bin/zi2c"
|
||||
make -C .test-server build ZIRAN="$GITHUB_WORKSPACE/build/ziran-toolchain/bin/ziran"
|
||||
make "$GITHUB_WORKSPACE/build/packages/ziran/build/bin/zi2c"
|
||||
make -C .test-server build ZIRAN="$GITHUB_WORKSPACE/build/packages/ziran/build/bin/ziran"
|
||||
make sync-server-test DAOCHI_BIN="$GITHUB_WORKSPACE/.test-server/daochi"
|
||||
|
||||
browser-addons:
|
||||
|
||||
@@ -45,7 +45,7 @@ jobs:
|
||||
- name: Install recipe dependencies
|
||||
run: |
|
||||
apt-get update
|
||||
apt-get install -y --no-install-recommends build-essential jimsh libssl-dev meson nasm ninja-build python3-fonttools openjdk-21-jdk-headless fdroidserver git-lfs
|
||||
apt-get install -y --no-install-recommends build-essential jimsh libssl-dev meson nasm ninja-build python3-fonttools ffmpeg openjdk-21-jdk-headless fdroidserver git-lfs
|
||||
update-alternatives --set java /usr/lib/jvm/java-21-openjdk-amd64/bin/java
|
||||
|
||||
- name: Checkout candidate
|
||||
|
||||
Reference in new issue
Block a user