diff options
| author | Philip Kuryloski <kuryloskip@vmware.com> | 2020-11-19 13:49:03 +0100 |
|---|---|---|
| committer | Philip Kuryloski <kuryloskip@vmware.com> | 2020-11-19 13:49:03 +0100 |
| commit | da5ee1db94513f060c2de9f993c3d773b3dd3f92 (patch) | |
| tree | a2088221b3bac05480a7114531bf0e15809f75ca | |
| parent | 8739893f7ff272449c1c8060966098879aade67f (diff) | |
| download | rabbitmq-server-git-da5ee1db94513f060c2de9f993c3d773b3dd3f92.tar.gz | |
Correct the condition on some GitHub Actions jobs
Due to the way that actions interprets those conditionals, the logic
to skip certain commits in ci was keeping certain fan-in jobs from
running appropriately
| -rw-r--r-- | .github/workflows/test-erlang-otp-22.3.yaml | 4 | ||||
| -rw-r--r-- | .github/workflows/test-erlang-otp-23.1.yaml | 4 | ||||
| -rw-r--r-- | workflow_sources/test/ct.lib.yml | 4 | ||||
| -rw-r--r-- | workflow_sources/test/finish.lib.yml | 4 |
4 files changed, 10 insertions, 6 deletions
diff --git a/.github/workflows/test-erlang-otp-22.3.yaml b/.github/workflows/test-erlang-otp-22.3.yaml index 5f94cda963..376e8ccbdb 100644 --- a/.github/workflows/test-erlang-otp-22.3.yaml +++ b/.github/workflows/test-erlang-otp-22.3.yaml @@ -7211,7 +7211,7 @@ jobs: - rabbit-ct-upgrade_preparation - rabbit-ct-vhost runs-on: ubuntu-18.04 - if: '!contains(github.event.head_commit.message, ''[ci skip]'')' + if: '!contains(github.event.head_commit.message, ''[ci skip]'') && always()' steps: - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master with: @@ -8502,7 +8502,7 @@ jobs: - rabbitmq_web_stomp_examples - package-generic-unix runs-on: ubuntu-18.04 - if: '!contains(github.event.head_commit.message, ''[ci skip]'')' + if: '!contains(github.event.head_commit.message, ''[ci skip]'') && always()' steps: - uses: technote-space/workflow-conclusion-action@v1 - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master diff --git a/.github/workflows/test-erlang-otp-23.1.yaml b/.github/workflows/test-erlang-otp-23.1.yaml index ebb484580b..e317c39d9b 100644 --- a/.github/workflows/test-erlang-otp-23.1.yaml +++ b/.github/workflows/test-erlang-otp-23.1.yaml @@ -3972,7 +3972,7 @@ jobs: - rabbit-ct-upgrade_preparation - rabbit-ct-vhost runs-on: ubuntu-18.04 - if: '!contains(github.event.head_commit.message, ''[ci skip]'')' + if: '!contains(github.event.head_commit.message, ''[ci skip]'') && always()' steps: - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master with: @@ -5264,7 +5264,7 @@ jobs: - rabbitmq_web_stomp_examples - package-generic-unix runs-on: ubuntu-18.04 - if: '!contains(github.event.head_commit.message, ''[ci skip]'')' + if: '!contains(github.event.head_commit.message, ''[ci skip]'') && always()' steps: - uses: technote-space/workflow-conclusion-action@v1 - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master diff --git a/workflow_sources/test/ct.lib.yml b/workflow_sources/test/ct.lib.yml index 5a3666776d..949e1f11ef 100644 --- a/workflow_sources/test/ct.lib.yml +++ b/workflow_sources/test/ct.lib.yml @@ -112,7 +112,9 @@ steps: name: #@ dep.name needs: #@ [dep.name + "-checks"] + [dep.name + "-ct-" + group["name"] for group in group_by_one(dep.suites)] runs-on: ubuntu-18.04 -if: #@ skip_ci_condition() +#! See https://docs.github.com/en/free-pro-team@latest/actions/reference/context-and-expression-syntax-for-github-actions#job-status-check-functions +#! as to why 'always()' is needed +if: #@ skip_ci_condition() + " && always()" #@yaml/text-templated-strings steps: - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master diff --git a/workflow_sources/test/finish.lib.yml b/workflow_sources/test/finish.lib.yml index 3d249a7f12..9fa74988fa 100644 --- a/workflow_sources/test/finish.lib.yml +++ b/workflow_sources/test/finish.lib.yml @@ -56,7 +56,9 @@ finish: name: finish needs: #@ prepare_jobs_names + [dep.name for dep in data.values.deps if not getattr(dep, "skip_tests", False)] + ['package-generic-unix'] runs-on: ubuntu-18.04 - if: #@ skip_ci_condition() + #! See https://docs.github.com/en/free-pro-team@latest/actions/reference/context-and-expression-syntax-for-github-actions#job-status-check-functions + #! as to why 'always()' is needed + if: #@ skip_ci_condition() + " && always()" #@yaml/text-templated-strings steps: - uses: technote-space/workflow-conclusion-action@v1 |