From c0f2c469a871742f0dfe8f1804f417691cb95a35 Mon Sep 17 00:00:00 2001 From: Pierre Millot Date: Thu, 13 Jan 2022 10:11:40 +0100 Subject: [PATCH 1/2] fix: check for string equality in bash --- scripts/ci/create-client-matrix.sh | 2 +- scripts/ci/create-spec-matrix.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ci/create-client-matrix.sh b/scripts/ci/create-client-matrix.sh index a927606c044..f369d23bf16 100755 --- a/scripts/ci/create-client-matrix.sh +++ b/scripts/ci/create-client-matrix.sh @@ -25,7 +25,7 @@ for pair in $clients; do folder=$(echo $pair | jq '.folder') spec_changed=$(git diff --shortstat origin/$BASE_BRANCH..HEAD -- specs/$name | wc -l) client_changed=$(git diff --shortstat origin/$BASE_BRANCH..HEAD -- $folder | wc -l) - if [[ $BASE_CHANGED || $spec_changed > 0 || $client_changed > 0 ]]; then + if [[ $BASE_CHANGED == "true" || $spec_changed > 0 || $client_changed > 0 ]]; then to_test=$(echo $to_test | jq --argjson pair $pair '.client |= .+ [$pair]') fi done diff --git a/scripts/ci/create-spec-matrix.sh b/scripts/ci/create-spec-matrix.sh index cff3aeb123e..dad804c6ce3 100755 --- a/scripts/ci/create-spec-matrix.sh +++ b/scripts/ci/create-spec-matrix.sh @@ -10,7 +10,7 @@ for generator in "${generators[@]}"; do client=${generator#*-} if [[ ! ${specs[*]} =~ $client ]]; then changed=$(git diff --shortstat origin/$BASE_BRANCH..HEAD -- specs/$client | wc -l) - if [[ $BASE_CHANGED || $changed > 0 ]]; then + if [[ $BASE_CHANGED == "true" || $changed > 0 ]]; then specs=$(echo $specs | jq --arg client $client '.client |= .+ [$client]') fi fi From 988314158723b165f4a3948d7263be31a1001887 Mon Sep 17 00:00:00 2001 From: Pierre Millot Date: Thu, 13 Jan 2022 10:50:02 +0100 Subject: [PATCH 2/2] run the cts when scripts change --- .github/actions/setup/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 177a55c5c04..5d0c437c85b 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -118,4 +118,4 @@ outputs: RUN_CTS: description: Determine if the `cts` job should run - value: ${{ github.ref_name == 'main' || steps.diff.outputs.GITHUB_ACTIONS_CHANGED > 0 || steps.diff.outputs.SPECS_CHANGED > 0 || steps.diff.outputs.TESTS_CHANGED > 0 || steps.diff.outputs.JS_CLIENT_CHANGED > 0 || steps.diff.outputs.JS_TEMPLATE_CHANGED > 0 || steps.diff.outputs.JAVA_CLIENT_CHANGED > 0 || steps.diff.outputs.JAVA_TEMPLATE_CHANGED > 0 }} + value: ${{ github.ref_name == 'main' || steps.diff.outputs.GITHUB_ACTIONS_CHANGED > 0 || steps.diff.outputs.SCRIPTS_CHANGED > 0 || steps.diff.outputs.SPECS_CHANGED > 0 || steps.diff.outputs.TESTS_CHANGED > 0 || steps.diff.outputs.JS_CLIENT_CHANGED > 0 || steps.diff.outputs.JS_TEMPLATE_CHANGED > 0 || steps.diff.outputs.JAVA_CLIENT_CHANGED > 0 || steps.diff.outputs.JAVA_TEMPLATE_CHANGED > 0 }}