From 730cb9f335609d06986c16ab80cd6d01e951134c Mon Sep 17 00:00:00 2001 From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com> Date: Fri, 13 Dec 2024 08:45:33 +0000 Subject: [PATCH 1/2] dbg --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 69148590613..6b9aa664cdd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -175,6 +175,7 @@ jobs: LABELS="" fi echo Labels: $LABELS + echo REF: $REF echo "list=$(./scripts/ci/get_e2e_jobs.sh $REF "$LABELS")" echo "list=$(./scripts/ci/get_e2e_jobs.sh $REF "$LABELS")" >> $GITHUB_OUTPUT - name: Create list of bench end-to-end jobs From ba1fc49de8c6700bdceb7db59f4856a36e2514b6 Mon Sep 17 00:00:00 2001 From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com> Date: Fri, 13 Dec 2024 09:05:12 +0000 Subject: [PATCH 2/2] fix: evaluate ref --- .github/workflows/ci.yml | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6b9aa664cdd..9cc619688a8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -166,23 +166,32 @@ jobs: # (Note ARM uses just 2 tests as a smoketest) - name: Create list of non-bench end-to-end jobs id: e2e_list - env: - REF: contains(github.ref_name, 'gh-readonly-queue') && 'master' || github.ref_name run: | + if [[ "$GITHUB_REF_NAME" == *"gh-readonly-queue"* ]]; then + REF="master" + else + REF="$GITHUB_REF_NAME" + fi + if [[ "$GITHUB_EVENT_NAME" == "pull_request" ]]; then LABELS=$(jq -r '.pull_request.labels | map(.name) | join(",")' "$GITHUB_EVENT_PATH") else LABELS="" fi - echo Labels: $LABELS + echo REF: $REF + echo Labels: $LABELS echo "list=$(./scripts/ci/get_e2e_jobs.sh $REF "$LABELS")" echo "list=$(./scripts/ci/get_e2e_jobs.sh $REF "$LABELS")" >> $GITHUB_OUTPUT - name: Create list of bench end-to-end jobs id: bench_list - env: - REF: contains(github.ref_name, 'gh-readonly-queue') && 'master' || github.ref_name run: | + if [[ "$GITHUB_REF_NAME" == *"gh-readonly-queue"* ]]; then + REF="master" + else + REF="$GITHUB_REF_NAME" + fi + if [[ "$GITHUB_EVENT_NAME" == "pull_request" ]]; then LABELS=$(jq -r '.pull_request.labels | map(.name) | join(",")' "$GITHUB_EVENT_PATH") else