From d61ca70423368bb5a7c49ab850ddc6769bb66efd Mon Sep 17 00:00:00 2001 From: Javier Cladellas Date: Thu, 12 Dec 2024 10:46:02 +0100 Subject: [PATCH] fix merge-json-config args #181 --- .github/workflows/benchmark_deploy.yml | 4 ++-- netlify-build.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/benchmark_deploy.yml b/.github/workflows/benchmark_deploy.yml index 624d74e7..67f0f193 100644 --- a/.github/workflows/benchmark_deploy.yml +++ b/.github/workflows/benchmark_deploy.yml @@ -58,7 +58,7 @@ jobs: - name: Merge stage configs run: | source .venv/bin/activate - merge-json-configs -fp ./tmp/**/website_config.json -o ./configs_tmp/stage_config.json -u + merge-json-configs -fp "./tmp/**/website_config.json" -o ./configs_tmp/stage_config.json -u - name: Update Stage Config run: | source .venv/bin/activate @@ -69,7 +69,7 @@ jobs: - name: Merge stage and prod configs run: | source .venv/bin/activate - merge-json-configs -fp ./configs_tmp/**/*.json -o ./configs_tmp/website_config.json + merge-json-configs -fp "./configs_tmp/**/*.json" -o ./configs_tmp/website_config.json - name: Upload New Website config run: | source .venv/bin/activate diff --git a/netlify-build.sh b/netlify-build.sh index ffd2b5a6..245f45fa 100755 --- a/netlify-build.sh +++ b/netlify-build.sh @@ -12,7 +12,7 @@ source ./girder_deploy_config.sh if [[ $HEAD == *"new-benchmark"* ]]; then echo "Downloading Staging benchmarks" girder-download -gid $staging_folder_id -o ./tmp/ -d - merge-json-configs -fp ./tmp/**/website_config.json -o ./tmp/website_config.json -u + merge-json-configs -fp "./tmp/**/website_config.json" -o ./tmp/website_config.json -u else echo "Downloading Production benchmarks" girder-download -gid $production_website_config_id -o ./tmp/ -fn website_config.json