From 20c000f6a2c33efb04925d621a6e26b211206819 Mon Sep 17 00:00:00 2001 From: Kim Christensen Date: Mon, 15 Apr 2024 23:58:55 +0200 Subject: [PATCH 1/3] Do not rely on dispatch inputs Signed-off-by: Kim Christensen --- .github/workflows/porter-canary.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/porter-canary.yml b/.github/workflows/porter-canary.yml index eda08cb28..39a6d924e 100644 --- a/.github/workflows/porter-canary.yml +++ b/.github/workflows/porter-canary.yml @@ -16,14 +16,20 @@ on: branches: - main - release/* - pull_request: - branches: - - split-builds jobs: - build_pipelinesrelease_template: + build_pipelinesrelease_template_workflow_dispatch: + if: ${{ github.event_name == 'workflow_dispatch' }} name: build_pipelinesrelease_template uses: ./.github/workflows/build_pipelinesrelease_template.yml with: registry: ghcr.io/getporter shouldPublish: "${{inputs.shouldPublish}}" skipTests: "${{inputs.skipTests}}" + build_pipelinesrelease_template_push: + if: ${{ github.event_name == 'push' }} + name: build_pipelinesrelease_template + uses: ./.github/workflows/build_pipelinesrelease_template.yml + with: + registry: ghcr.io/getporter + shouldPublish: true + skipTests: false From 375aac4a40dd1f42ee152d8d4f4cd2e8bdc127fe Mon Sep 17 00:00:00 2001 From: Kim Christensen Date: Tue, 16 Apr 2024 08:30:21 +0200 Subject: [PATCH 2/3] Add names to workflow jobs Signed-off-by: Kim Christensen --- .github/workflows/porter-canary.yml | 4 ++-- .../workflows/porter-integration-release.yml | 21 +++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/.github/workflows/porter-canary.yml b/.github/workflows/porter-canary.yml index 39a6d924e..039f82a17 100644 --- a/.github/workflows/porter-canary.yml +++ b/.github/workflows/porter-canary.yml @@ -19,7 +19,7 @@ on: jobs: build_pipelinesrelease_template_workflow_dispatch: if: ${{ github.event_name == 'workflow_dispatch' }} - name: build_pipelinesrelease_template + name: build_pipelinesrelease_template_workflow_dispatch uses: ./.github/workflows/build_pipelinesrelease_template.yml with: registry: ghcr.io/getporter @@ -27,7 +27,7 @@ jobs: skipTests: "${{inputs.skipTests}}" build_pipelinesrelease_template_push: if: ${{ github.event_name == 'push' }} - name: build_pipelinesrelease_template + name: build_pipelinesrelease_template_push uses: ./.github/workflows/build_pipelinesrelease_template.yml with: registry: ghcr.io/getporter diff --git a/.github/workflows/porter-integration-release.yml b/.github/workflows/porter-integration-release.yml index 19b59b1ad..95634fc29 100644 --- a/.github/workflows/porter-integration-release.yml +++ b/.github/workflows/porter-integration-release.yml @@ -12,107 +12,128 @@ env: jobs: archive_integration_test: + name: Archive Integration Test uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main with: test_name: archive_test registry: ${{inputs.registry}} build_integration_test: + name: Build Integration Test uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main with: test_name: build_test registry: ${{inputs.registry}} cli_integration_test: + name: CLI Integration Test uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main with: test_name: cli_test registry: ${{inputs.registry}} connection_nix_integration_test: + name: Connection Integration Test uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main with: test_name: connection_nix_test registry: ${{inputs.registry}} copy_integration_test: + name: Copy Integration Test uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main with: test_name: copy_test registry: ${{inputs.registry}} dependenciesv1_integration_test: + name: Dependencies V1 Integration Test uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main with: test_name: dependenciesv1_test registry: ${{inputs.registry}} dependenciesv2_integration_test: + name: Dependencies V2 Integration Test uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main with: test_name: dependenciesv2_test registry: ${{inputs.registry}} driver_integration_test: + name: Driver Integration Test uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main with: test_name: driver_test registry: ${{inputs.registry}} install_integration_test: + name: Install Integration Test uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main with: test_name: install_test registry: ${{inputs.registry}} invoke_integration_test: + name: Invoke Integration Test uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main with: test_name: invoke_test registry: ${{inputs.registry}} lint_integration_test: + name: Lint Integration Test uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main with: test_name: lint_test registry: ${{inputs.registry}} migration_integration_test: + name: Migration Integration Test uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main with: test_name: migration_test registry: ${{inputs.registry}} outputs_integration_test: + name: Outputs Integration Test uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main with: test_name: outputs_test registry: ${{inputs.registry}} publish_integration_test: + name: Publish Integration Test uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main with: test_name: publish_test registry: ${{inputs.registry}} pull_integration_test: + name: Pull Integration Test uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main with: test_name: pull_test registry: ${{inputs.registry}} registry_integration_test: + name: Registry Integration Test uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main with: test_name: registry_integration_test registry: ${{inputs.registry}} schema_integration_test: + name: Schema Integration Test uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main with: test_name: schema_test registry: ${{inputs.registry}} sensitive_data_integration_test: + name: Sensitive data Integration Test uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main with: test_name: sensitive_data_test registry: ${{inputs.registry}} suppress_output_integration_test: + name: Suppress output Integration Test uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main with: test_name: suppress_output_test registry: ${{inputs.registry}} telemetry_test: + name: Telemetry Integration Test uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main with: test_name: telemetry_test registry: ${{inputs.registry}} # Reusable workflows only supports 20 jobs uninstall_test_integ: + name: Uninstall Integration Test runs-on: ubuntu-latest steps: - name: checkout From 83e01f5539e6c4a9406f8a4853a27450674c90a3 Mon Sep 17 00:00:00 2001 From: Kim Christensen Date: Wed, 17 Apr 2024 22:38:29 +0200 Subject: [PATCH 3/3] Remove workflow dispatch trigger from canary build Signed-off-by: Kim Christensen --- .github/workflows/porter-canary.yml | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/.github/workflows/porter-canary.yml b/.github/workflows/porter-canary.yml index 039f82a17..2b67a6185 100644 --- a/.github/workflows/porter-canary.yml +++ b/.github/workflows/porter-canary.yml @@ -1,33 +1,12 @@ name: porter/porter-canary on: - workflow_dispatch: - inputs: - shouldPublish: - description: Should Publish - default: true - type: boolean - required: false - skipTests: - description: Skip Tests - default: false - type: boolean - required: false push: branches: - main - release/* jobs: - build_pipelinesrelease_template_workflow_dispatch: - if: ${{ github.event_name == 'workflow_dispatch' }} - name: build_pipelinesrelease_template_workflow_dispatch - uses: ./.github/workflows/build_pipelinesrelease_template.yml - with: - registry: ghcr.io/getporter - shouldPublish: "${{inputs.shouldPublish}}" - skipTests: "${{inputs.skipTests}}" - build_pipelinesrelease_template_push: - if: ${{ github.event_name == 'push' }} - name: build_pipelinesrelease_template_push + build_pipelinesrelease_template: + name: build_pipelinesrelease_template uses: ./.github/workflows/build_pipelinesrelease_template.yml with: registry: ghcr.io/getporter