From 2a9a1521d2c77bf25324b0d7e45d36cb694de605 Mon Sep 17 00:00:00 2001 From: Benjamin Deleze Date: Tue, 3 Oct 2023 14:34:01 +0200 Subject: [PATCH 1/4] remove emsdk when building on CI --- scripts/install/linux_optional_compilation_dependencies.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/install/linux_optional_compilation_dependencies.sh b/scripts/install/linux_optional_compilation_dependencies.sh index 1e0f56e1c21..a0fe2263435 100755 --- a/scripts/install/linux_optional_compilation_dependencies.sh +++ b/scripts/install/linux_optional_compilation_dependencies.sh @@ -29,4 +29,7 @@ fi script_full_path=$(dirname "$0") $script_full_path/linux_test_dependencies.sh --norecurse $script_full_path/linux_compilation_dependencies.sh -$script_full_path/linux_web_viewer_dependencies.sh + +if [[ ! $CI ]]; then + $script_full_path/linux_web_viewer_dependencies.sh +fi From d00615d90aef31e7a8fb0b8263e496bc9829b9db Mon Sep 17 00:00:00 2001 From: Benjamin Deleze Date: Tue, 3 Oct 2023 15:47:44 +0200 Subject: [PATCH 2/4] fix script --- scripts/install/linux_optional_compilation_dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install/linux_optional_compilation_dependencies.sh b/scripts/install/linux_optional_compilation_dependencies.sh index a0fe2263435..2e8846f8fc4 100755 --- a/scripts/install/linux_optional_compilation_dependencies.sh +++ b/scripts/install/linux_optional_compilation_dependencies.sh @@ -30,6 +30,6 @@ script_full_path=$(dirname "$0") $script_full_path/linux_test_dependencies.sh --norecurse $script_full_path/linux_compilation_dependencies.sh -if [[ ! $CI ]]; then +if [[ -z "$CI" ]]; then $script_full_path/linux_web_viewer_dependencies.sh fi From 8f5de19a447f2ac6a5ff0dbfe583888cb1bf1dbc Mon Sep 17 00:00:00 2001 From: Benjamin Deleze Date: Tue, 3 Oct 2023 16:18:22 +0200 Subject: [PATCH 3/4] test with another variable --- scripts/install/linux_optional_compilation_dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install/linux_optional_compilation_dependencies.sh b/scripts/install/linux_optional_compilation_dependencies.sh index 2e8846f8fc4..28313d4bd90 100755 --- a/scripts/install/linux_optional_compilation_dependencies.sh +++ b/scripts/install/linux_optional_compilation_dependencies.sh @@ -30,6 +30,6 @@ script_full_path=$(dirname "$0") $script_full_path/linux_test_dependencies.sh --norecurse $script_full_path/linux_compilation_dependencies.sh -if [[ -z "$CI" ]]; then +if [[ -z "$SNAPCRAFT_PART_BUILD" ]]; then $script_full_path/linux_web_viewer_dependencies.sh fi From 3b54c0b4ba2f2e011bff6110ee27923b3b71fac6 Mon Sep 17 00:00:00 2001 From: Benjamin Deleze Date: Tue, 3 Oct 2023 16:44:42 +0200 Subject: [PATCH 4/4] test new variable --- scripts/install/linux_optional_compilation_dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install/linux_optional_compilation_dependencies.sh b/scripts/install/linux_optional_compilation_dependencies.sh index 28313d4bd90..812413cbed6 100755 --- a/scripts/install/linux_optional_compilation_dependencies.sh +++ b/scripts/install/linux_optional_compilation_dependencies.sh @@ -30,6 +30,6 @@ script_full_path=$(dirname "$0") $script_full_path/linux_test_dependencies.sh --norecurse $script_full_path/linux_compilation_dependencies.sh -if [[ -z "$SNAPCRAFT_PART_BUILD" ]]; then +if [[ -z "$SNAP" ]]; then $script_full_path/linux_web_viewer_dependencies.sh fi