Skip to content

Commit

Permalink
workding
Browse files Browse the repository at this point in the history
  • Loading branch information
paulrouget committed Feb 7, 2024
1 parent 98f191e commit d9ce05f
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ jobs:
- run: sudo dpkg -r net.downloadhelper.coapp
- run: sudo apt-get update
- run: sudo apt-get install ffmpeg
- run: sudo dpkg -i ./dist/linux/x86_64/vdhcoapp-no-ffmpeg-linux-x86_64.deb
- run: ./tests/test.mjs /opt/vdhcoapp/vdhcoapp --with-network --no-ffmpeg-codecs-tests
- run: sudo dpkg -i ./dist/linux/x86_64/vdhcoapp-noffmpeg-linux-x86_64.deb
- run: ./tests/test.mjs /opt/vdhcoapp/vdhcoapp --skip-codecs-tests
- run: sudo dpkg -r net.downloadhelper.coapp.noffmpeg
16 changes: 8 additions & 8 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -192,17 +192,17 @@ fi
if [ $publish == 1 ]; then
files=(
"dist/linux/i686/$package_binary_name-linux-i686.tar.bz2"
"dist/linux/i686/$package_binary_name-no-ffmpeg-linux-i686.tar.bz2"
"dist/linux/i686/$package_binary_name-noffmpeg-linux-i686.tar.bz2"
"dist/linux/i686/$package_binary_name-linux-i686.deb"
"dist/linux/i686/$package_binary_name-no-ffmpeg-linux-i686.deb"
"dist/linux/i686/$package_binary_name-noffmpeg-linux-i686.deb"
"dist/linux/x86_64/$package_binary_name-linux-x86_64.tar.bz2"
"dist/linux/x86_64/$package_binary_name-no-ffmpeg-linux-x86_64.tar.bz2"
"dist/linux/x86_64/$package_binary_name-noffmpeg-linux-x86_64.tar.bz2"
"dist/linux/x86_64/$package_binary_name-linux-x86_64.deb"
"dist/linux/x86_64/$package_binary_name-no-ffmpeg-linux-x86_64.deb"
"dist/linux/x86_64/$package_binary_name-noffmpeg-linux-x86_64.deb"
"dist/linux/aarch64/$package_binary_name-linux-aarch64.tar.bz2"
"dist/linux/aarch64/$package_binary_name-no-ffmpeg-linux-aarch64.tar.bz2"
"dist/linux/aarch64/$package_binary_name-noffmpeg-linux-aarch64.tar.bz2"
"dist/linux/aarch64/$package_binary_name-linux-aarch64.deb"
"dist/linux/aarch64/$package_binary_name-no-ffmpeg-linux-aarch64.deb"
"dist/linux/aarch64/$package_binary_name-noffmpeg-linux-aarch64.deb"
"dist/mac/x86_64/$package_binary_name-mac-x86_64.dmg"
"dist/mac/x86_64/$package_binary_name-mac-x86_64-installer.pkg"
"dist/mac/arm64/$package_binary_name-mac-arm64.dmg"
Expand Down Expand Up @@ -289,8 +289,8 @@ yq . -o yaml ./config.toml | \

out_deb_file="$package_binary_name-$target.deb"
out_bz2_file="$package_binary_name-$target.tar.bz2"
out_noffmpeg_deb_file="$package_binary_name-no-ffmpeg-$target.deb"
out_noffmpeg_bz2_file="$package_binary_name-no-ffmpeg-$target.tar.bz2"
out_noffmpeg_deb_file="$package_binary_name-noffmpeg-$target.deb"
out_noffmpeg_bz2_file="$package_binary_name-noffmpeg-$target.tar.bz2"
out_pkg_file="$package_binary_name-$target-installer.pkg"
out_dmg_file="$package_binary_name-$target.dmg"
out_win_file="$package_binary_name-$target-installer.exe"
Expand Down
10 changes: 5 additions & 5 deletions tests/test.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,12 @@ let arg2 = process.argv[2];
let arg3n = process.argv.slice(3);

let with_network = false;
let no_ffmpeg_codecs_tests = false;
let skip_codecs_tests = false;
if (arg2 === "--with-network" || arg3n.includes("--with-network")) {
with_network = true;
}
if (arg2 === "--no-ffmpeg-codecs-tests" || arg3n.includes("--no-ffmpeg-codecs-tests")) {
no_ffmpeg_codecs_tests = true;
if (arg2 === "--skip-codecs-tests" || arg3n.includes("--skip-codecs-tests")) {
skip_codecs_tests = true;
}

let arg2_is_bin = false;
Expand Down Expand Up @@ -214,8 +214,8 @@ let old_coapp;
}

if (!old_coapp) {
if (no_ffmpeg_codecs_tests) {
console.warn("Skipping codecs and format tests because of flag --no-ffmpeg-codecs-tests.");
if (skip_codecs_tests) {
console.warn("Skipping codecs and format tests because of flag --skip-codecs-tests.");
} else {
const codecs = await exec("codecs");
assert_deep_equal("codecs", codecs, expected_codecs);
Expand Down

0 comments on commit d9ce05f

Please sign in to comment.