From 17ad66d6debf4419221447b562fc561fb0adc1b8 Mon Sep 17 00:00:00 2001 From: Stephen Date: Wed, 29 Mar 2023 22:49:54 -0400 Subject: [PATCH 1/3] Standardize CI triggers --- .github/workflows/buf-lint.yml | 1 + .../workflows/build-and-test-mac-windows.yml | 26 ------------------- .github/workflows/build-and-test.yml | 3 ++- .github/workflows/build-linux-binaries.yml | 1 - .github/workflows/build-public-api.yml | 6 ++--- .github/workflows/build.yml | 1 + .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/net-outage-sim.yml | 2 +- .github/workflows/publish_docker_image.yml | 2 +- .../workflows/run-kurtosis-tests-basic.yml | 1 + .github/workflows/static-analysis.yml | 6 +---- .github/workflows/test.e2e.yml | 3 +++ .github/workflows/test.upgrade.yml | 3 +++ 13 files changed, 18 insertions(+), 39 deletions(-) delete mode 100644 .github/workflows/build-and-test-mac-windows.yml diff --git a/.github/workflows/buf-lint.yml b/.github/workflows/buf-lint.yml index 85d51482ea0..6186c37d77e 100644 --- a/.github/workflows/buf-lint.yml +++ b/.github/workflows/buf-lint.yml @@ -2,6 +2,7 @@ name: Lint proto files on: push: + pull_request: permissions: contents: read diff --git a/.github/workflows/build-and-test-mac-windows.yml b/.github/workflows/build-and-test-mac-windows.yml deleted file mode 100644 index fbfcd02e5f8..00000000000 --- a/.github/workflows/build-and-test-mac-windows.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: Build + Test Mac-Windows - -on: - push: - tags: - - "*" # Push events to every tag - branches: - - dev - - master - -jobs: - run_build_tests: - name: build_tests - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [windows-latest, macos-latest] - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-go@v3 - with: - go-version: '~1.19.6' - check-latest: true - - name: build_test - shell: bash - run: .github/workflows/build_and_test.sh diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 0ecf0de80e4..a34aaadf1ca 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -2,6 +2,7 @@ name: Build + Unit Tests on: push: + pull_request: jobs: run_build_unit_tests: @@ -9,7 +10,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [macos-12, ubuntu-20.04, ubuntu-22.04, windows-latest, [self-hosted, linux, ARM64, focal],[self-hosted, linux, ARM64, jammy]] + os: [macos-12, ubuntu-20.04, ubuntu-22.04, windows-2022, [self-hosted, linux, ARM64, focal], [self-hosted, linux, ARM64, jammy]] steps: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 diff --git a/.github/workflows/build-linux-binaries.yml b/.github/workflows/build-linux-binaries.yml index 949f648f216..12473c3f82b 100644 --- a/.github/workflows/build-linux-binaries.yml +++ b/.github/workflows/build-linux-binaries.yml @@ -6,7 +6,6 @@ on: tag: description: 'Tag to include in artifact name' required: true - push: tags: - "*" diff --git a/.github/workflows/build-public-api.yml b/.github/workflows/build-public-api.yml index 05145d95ea0..6530151cfcc 100644 --- a/.github/workflows/build-public-api.yml +++ b/.github/workflows/build-public-api.yml @@ -1,14 +1,14 @@ name: build-public-ami on: - push: - tags: - - "*" workflow_dispatch: inputs: tag: description: 'Tag to create AMI from' required: true + push: + tags: + - "*" jobs: build-public-ami-and-upload: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 12818ddd8a1..1cca150586b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,6 +4,7 @@ name: Build on supported platforms on: push: + pull_request: permissions: contents: write diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 61dc8672c63..79eabc1a5ae 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -16,7 +16,7 @@ on: branches: [master, dev] pull_request: # The branches below must be a subset of the branches above - branches: [master] + branches: [master, dev] schedule: - cron: "44 11 * * 4" diff --git a/.github/workflows/net-outage-sim.yml b/.github/workflows/net-outage-sim.yml index e911fc37620..296ef7be95b 100644 --- a/.github/workflows/net-outage-sim.yml +++ b/.github/workflows/net-outage-sim.yml @@ -1,11 +1,11 @@ name: network-outage-simulation on: + workflow_dispatch: schedule: # * is a special character in YAML so you have to quote this string # Run every day at 7 AM. (The database backup is created around 5 AM.) - cron: "0 7 * * *" - workflow_dispatch: jobs: run_sim: diff --git a/.github/workflows/publish_docker_image.yml b/.github/workflows/publish_docker_image.yml index 1595dd9d9a1..63a29b08e6e 100644 --- a/.github/workflows/publish_docker_image.yml +++ b/.github/workflows/publish_docker_image.yml @@ -1,13 +1,13 @@ name: Publish Docker Image on: + workflow_dispatch: push: tags: - "*" branches: - master - dev - workflow_dispatch: jobs: publish_docker_image: diff --git a/.github/workflows/run-kurtosis-tests-basic.yml b/.github/workflows/run-kurtosis-tests-basic.yml index 72683ac110c..2ef625a41fe 100644 --- a/.github/workflows/run-kurtosis-tests-basic.yml +++ b/.github/workflows/run-kurtosis-tests-basic.yml @@ -7,6 +7,7 @@ on: branches-ignore: - master - dev + pull_request: jobs: run_kurtosis_tests: diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 516b8899abc..5b7f8768572 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -1,11 +1,7 @@ name: Static analysis on: push: - tags-ignore: - - "*" # Ignores all tags - branches-ignore: - - master - - dev + pull_request: jobs: run_static_analysis: diff --git a/.github/workflows/test.e2e.yml b/.github/workflows/test.e2e.yml index 1a1f746f005..40c504fbb3c 100644 --- a/.github/workflows/test.e2e.yml +++ b/.github/workflows/test.e2e.yml @@ -2,7 +2,10 @@ name: Test e2e on: push: + tags: + - "*" # Push events to every tag branches: + - master - dev pull_request: diff --git a/.github/workflows/test.upgrade.yml b/.github/workflows/test.upgrade.yml index 9bb00976ba1..307015916e2 100644 --- a/.github/workflows/test.upgrade.yml +++ b/.github/workflows/test.upgrade.yml @@ -2,7 +2,10 @@ name: Test upgrade on: push: + tags: + - "*" # Push events to every tag branches: + - master - dev pull_request: From 569d33d6584821c523d7a5931766ee5db960ff9a Mon Sep 17 00:00:00 2001 From: Stephen Date: Wed, 29 Mar 2023 23:07:51 -0400 Subject: [PATCH 2/3] take 2 --- .github/workflows/buf-lint.yml | 5 +++++ .github/workflows/build-and-test.yml | 5 +++++ .github/workflows/build-macos-release.yml | 2 +- .github/workflows/build-win-release.yml | 2 +- .github/workflows/build.yml | 5 +++++ .github/workflows/run-kurtosis-tests-basic.yml | 6 ------ .github/workflows/run-kurtosis-tests-full.yml | 2 +- .github/workflows/static-analysis.yml | 5 +++++ .github/workflows/test.e2e.yml | 2 +- .github/workflows/test.upgrade.yml | 2 +- 10 files changed, 25 insertions(+), 11 deletions(-) diff --git a/.github/workflows/buf-lint.yml b/.github/workflows/buf-lint.yml index 6186c37d77e..ac695f9cc5c 100644 --- a/.github/workflows/buf-lint.yml +++ b/.github/workflows/buf-lint.yml @@ -2,6 +2,11 @@ name: Lint proto files on: push: + tags: + - "*" + branches: + - master + - dev pull_request: permissions: diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index a34aaadf1ca..72515d16c87 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -2,6 +2,11 @@ name: Build + Unit Tests on: push: + tags: + - "*" + branches: + - master + - dev pull_request: jobs: diff --git a/.github/workflows/build-macos-release.yml b/.github/workflows/build-macos-release.yml index 3b3fb3af24a..fc7e3a7c810 100644 --- a/.github/workflows/build-macos-release.yml +++ b/.github/workflows/build-macos-release.yml @@ -11,7 +11,7 @@ on: required: true push: tags: - - "*" # Push events to every tag + - "*" # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: diff --git a/.github/workflows/build-win-release.yml b/.github/workflows/build-win-release.yml index b180983a650..afce83159f9 100644 --- a/.github/workflows/build-win-release.yml +++ b/.github/workflows/build-win-release.yml @@ -11,7 +11,7 @@ on: required: true push: tags: - - "*" # Push events to every tag + - "*" # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1cca150586b..f9619ab4894 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,6 +4,11 @@ name: Build on supported platforms on: push: + tags: + - "*" + branches: + - master + - dev pull_request: permissions: diff --git a/.github/workflows/run-kurtosis-tests-basic.yml b/.github/workflows/run-kurtosis-tests-basic.yml index 2ef625a41fe..f4293db7212 100644 --- a/.github/workflows/run-kurtosis-tests-basic.yml +++ b/.github/workflows/run-kurtosis-tests-basic.yml @@ -1,12 +1,6 @@ name: Kurtosis Tests Basic on: - push: - tags-ignore: - - "*" # Ignores all tags - branches-ignore: - - master - - dev pull_request: jobs: diff --git a/.github/workflows/run-kurtosis-tests-full.yml b/.github/workflows/run-kurtosis-tests-full.yml index e50dc53fbeb..23b86e48248 100644 --- a/.github/workflows/run-kurtosis-tests-full.yml +++ b/.github/workflows/run-kurtosis-tests-full.yml @@ -3,7 +3,7 @@ name: Kurtosis Tests Full on: push: tags: - - "*" # Push events to every tag + - "*" branches: - master - dev diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index 5b7f8768572..2942f8d894a 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -1,6 +1,11 @@ name: Static analysis on: push: + tags: + - "*" + branches: + - master + - dev pull_request: jobs: diff --git a/.github/workflows/test.e2e.yml b/.github/workflows/test.e2e.yml index 40c504fbb3c..49030256c9c 100644 --- a/.github/workflows/test.e2e.yml +++ b/.github/workflows/test.e2e.yml @@ -3,7 +3,7 @@ name: Test e2e on: push: tags: - - "*" # Push events to every tag + - "*" branches: - master - dev diff --git a/.github/workflows/test.upgrade.yml b/.github/workflows/test.upgrade.yml index 307015916e2..f9a204a328c 100644 --- a/.github/workflows/test.upgrade.yml +++ b/.github/workflows/test.upgrade.yml @@ -3,7 +3,7 @@ name: Test upgrade on: push: tags: - - "*" # Push events to every tag + - "*" branches: - master - dev From 04d4085c9b1595648ad093a72322e47a52894df1 Mon Sep 17 00:00:00 2001 From: Stephen Date: Wed, 29 Mar 2023 23:09:01 -0400 Subject: [PATCH 3/3] drop kurtosis from required ci --- .github/workflows/run-kurtosis-tests-basic.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-kurtosis-tests-basic.yml b/.github/workflows/run-kurtosis-tests-basic.yml index f4293db7212..72683ac110c 100644 --- a/.github/workflows/run-kurtosis-tests-basic.yml +++ b/.github/workflows/run-kurtosis-tests-basic.yml @@ -1,7 +1,12 @@ name: Kurtosis Tests Basic on: - pull_request: + push: + tags-ignore: + - "*" # Ignores all tags + branches-ignore: + - master + - dev jobs: run_kurtosis_tests: