From 3928f963cc324b0e5ad3d31fe9d20fa2bff71a42 Mon Sep 17 00:00:00 2001 From: John Murret Date: Thu, 6 Apr 2023 17:33:58 +0000 Subject: [PATCH 1/6] backport of commit b95230eedcae50380c8f83100139fa58b7fbfa19 --- .github/workflows/go-tests.yml | 36 ++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/.github/workflows/go-tests.yml b/.github/workflows/go-tests.yml index ca90ac31d34..7a68f69137c 100644 --- a/.github/workflows/go-tests.yml +++ b/.github/workflows/go-tests.yml @@ -229,6 +229,7 @@ jobs: consul-license: ${{secrets.CONSUL_LICENSE}} go-test-enterprise: + if: ${{ endsWith(github.repository, '-enterprise') }} needs: - setup - dev-build @@ -363,3 +364,38 @@ jobs: runs-on: ubuntu-latest steps: - run: "echo ok" + + # This is job is required for branch protection as a required gihub check + # because GitHub actions show up as checks at the job level and not the + # workflow level. This is currently a feature request: + # https://github.com/orgs/community/discussions/12395 + # + # This job must: + # - be placed after the fanout of a workflow so that everything fans back in + # to this job. + # - "need" any job that is part of the fan out / fan in + # - implement the if logic because we have conditional jobs + # (go-test-enteprise) that this job needs and this would potentially get + # skipped if a previous job got skipped. So we use the if clause to make + # sure it does not get skipped. + + go-tests-success: + needs: + - lint + - lint32bit + - go-test-enterprise + - go-test-oss + - go-test-race + - go-test-envoyextensions + - go-test-troubleshooting + - go-test-api-1-19 + - go-test-api-1-20 + - go-test-sdk-1-19 + - go-test-sdk-1-20 + runs-on: ${{ fromJSON(needs.setup.outputs.compute-small) }} + if: | + (always() && ! cancelled()) && + !contains(needs.*.result, 'failure') && + !contains(needs.*.result, 'cancelled') + steps: + - run: "go-tests succeeded" From d3fc8f3dc65872a578d6ac61d92d8186d20bca5d Mon Sep 17 00:00:00 2001 From: John Murret Date: Thu, 6 Apr 2023 17:37:06 +0000 Subject: [PATCH 2/6] backport of commit 763a5dc5d861b5f8689756feab6fa3f453281970 --- .github/workflows/go-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/go-tests.yml b/.github/workflows/go-tests.yml index 7a68f69137c..2abcad62702 100644 --- a/.github/workflows/go-tests.yml +++ b/.github/workflows/go-tests.yml @@ -382,7 +382,7 @@ jobs: go-tests-success: needs: - lint - - lint32bit + - lint-32bit - go-test-enterprise - go-test-oss - go-test-race From b1c8067ac25e3149e99ab12bf0ad6e736567792f Mon Sep 17 00:00:00 2001 From: John Murret Date: Thu, 6 Apr 2023 17:38:24 +0000 Subject: [PATCH 3/6] backport of commit 5fd35bf7b8cc5e8294e53340c0e64abe9fc3ed0e --- .github/workflows/go-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/go-tests.yml b/.github/workflows/go-tests.yml index 2abcad62702..cc9aee64043 100644 --- a/.github/workflows/go-tests.yml +++ b/.github/workflows/go-tests.yml @@ -387,7 +387,7 @@ jobs: - go-test-oss - go-test-race - go-test-envoyextensions - - go-test-troubleshooting + - go-test-troubleshoot - go-test-api-1-19 - go-test-api-1-20 - go-test-sdk-1-19 From 900c07071c28f54086d2dfc857f1ff0b0bff036f Mon Sep 17 00:00:00 2001 From: John Murret Date: Thu, 6 Apr 2023 17:43:03 +0000 Subject: [PATCH 4/6] backport of commit c1d4fb1fd0b3795f7f8bd0881b1ff6f3d927ebf2 --- .github/workflows/go-tests.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/go-tests.yml b/.github/workflows/go-tests.yml index cc9aee64043..4121414df49 100644 --- a/.github/workflows/go-tests.yml +++ b/.github/workflows/go-tests.yml @@ -381,8 +381,15 @@ jobs: go-tests-success: needs: + - check-generated-deep-copy + - check-generated-protobuf + - check-go-mod + - lint-consul-retry + - lint-container-test-deps + - lint-enums - lint - lint-32bit + # - go-test-arm64 - go-test-enterprise - go-test-oss - go-test-race @@ -392,6 +399,7 @@ jobs: - go-test-api-1-20 - go-test-sdk-1-19 - go-test-sdk-1-20 + - go-test-32bit runs-on: ${{ fromJSON(needs.setup.outputs.compute-small) }} if: | (always() && ! cancelled()) && From 8d1d8c4ff941e981d8ecb644c4a377ddbd343eeb Mon Sep 17 00:00:00 2001 From: John Murret Date: Thu, 6 Apr 2023 18:02:00 +0000 Subject: [PATCH 5/6] backport of commit b5083fc1495f186f3fccabbb8ef4026481515782 --- .github/workflows/go-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/go-tests.yml b/.github/workflows/go-tests.yml index 4121414df49..1c1b0f2b5ae 100644 --- a/.github/workflows/go-tests.yml +++ b/.github/workflows/go-tests.yml @@ -381,6 +381,7 @@ jobs: go-tests-success: needs: + - setup - check-generated-deep-copy - check-generated-protobuf - check-go-mod From 5c574a8073158050a51324d6259728fbbad5b1a6 Mon Sep 17 00:00:00 2001 From: John Murret Date: Thu, 6 Apr 2023 18:31:45 +0000 Subject: [PATCH 6/6] backport of commit 31ea1f60bc0052913a7c53aba1c57f9ed767be21 --- .github/workflows/go-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/go-tests.yml b/.github/workflows/go-tests.yml index 1c1b0f2b5ae..83c37d3b324 100644 --- a/.github/workflows/go-tests.yml +++ b/.github/workflows/go-tests.yml @@ -407,4 +407,4 @@ jobs: !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') steps: - - run: "go-tests succeeded" + - run: echo "go-tests succeeded"