From de9972d2633952a8b5d61709b4048ab4d880f650 Mon Sep 17 00:00:00 2001 From: Thomas Burkhalter Date: Tue, 23 Jul 2024 15:05:51 +0200 Subject: [PATCH] Move reusable workflows --- .github/workflows/build-int-on-push.yaml | 6 ++++-- .github/workflows/build-prod-on-release.yaml | 2 +- .github/workflows/manual-build.yaml | 2 +- .../{actions/build.yaml => workflows/reusable_build.yaml} | 0 .../reusable_copy-images.yaml} | 0 .../{actions/lint.yaml => workflows/reusable_lint.yaml} | 0 .../reusable_lint_test_build_update.yaml} | 8 ++++---- .../{actions/sbom.yaml => workflows/reusable_sbom.yaml} | 0 .../{actions/tests.yaml => workflows/reusable_tests.yaml} | 0 .../reusable_update_image.yaml} | 0 10 files changed, 10 insertions(+), 8 deletions(-) rename .github/{actions/build.yaml => workflows/reusable_build.yaml} (100%) rename .github/{actions/copy-images.yaml => workflows/reusable_copy-images.yaml} (100%) rename .github/{actions/lint.yaml => workflows/reusable_lint.yaml} (100%) rename .github/{actions/lint_test_build_update.yaml => workflows/reusable_lint_test_build_update.yaml} (79%) rename .github/{actions/sbom.yaml => workflows/reusable_sbom.yaml} (100%) rename .github/{actions/tests.yaml => workflows/reusable_tests.yaml} (100%) rename .github/{actions/update_image.yaml => workflows/reusable_update_image.yaml} (100%) diff --git a/.github/workflows/build-int-on-push.yaml b/.github/workflows/build-int-on-push.yaml index 80e56d6..06daf08 100644 --- a/.github/workflows/build-int-on-push.yaml +++ b/.github/workflows/build-int-on-push.yaml @@ -9,9 +9,11 @@ on: - 'doc/**' - '**.md' jobs: - build_image: - uses: ./.github/actions/lint_test_build_update.yaml + build-image: + uses: ./.github/workflows/reusable_lint_test_build_update.yaml with: image_repo: "harbor.puzzle.ch/decidim/stlu/int/rails" configmanagement: "gitlab.puzzle.ch/pitc_ruby/decidim-configmanagement" kustomization_path: "./deployments/pitc-stlu-decidim-int/kustomization.yaml" + + diff --git a/.github/workflows/build-prod-on-release.yaml b/.github/workflows/build-prod-on-release.yaml index 1b89b1c..fd73e5d 100644 --- a/.github/workflows/build-prod-on-release.yaml +++ b/.github/workflows/build-prod-on-release.yaml @@ -10,7 +10,7 @@ on: - master jobs: build_image: - uses: ./.github/actions/lint_test_build_update.yaml + uses: ./.github/workflows/lint_test_build_update.yaml secrets: inherit with: image_repo: "harbor.puzzle.ch/decidim/stlu/prod/rails" diff --git a/.github/workflows/manual-build.yaml b/.github/workflows/manual-build.yaml index dd60146..172ae4a 100644 --- a/.github/workflows/manual-build.yaml +++ b/.github/workflows/manual-build.yaml @@ -10,7 +10,7 @@ on: jobs: build: - uses: ./.github/actions/build.yaml + uses: ./.github/workflows/reusable_build.yaml secrets: inherit with: repository_url: ${{ inputs.image_repo }} diff --git a/.github/actions/build.yaml b/.github/workflows/reusable_build.yaml similarity index 100% rename from .github/actions/build.yaml rename to .github/workflows/reusable_build.yaml diff --git a/.github/actions/copy-images.yaml b/.github/workflows/reusable_copy-images.yaml similarity index 100% rename from .github/actions/copy-images.yaml rename to .github/workflows/reusable_copy-images.yaml diff --git a/.github/actions/lint.yaml b/.github/workflows/reusable_lint.yaml similarity index 100% rename from .github/actions/lint.yaml rename to .github/workflows/reusable_lint.yaml diff --git a/.github/actions/lint_test_build_update.yaml b/.github/workflows/reusable_lint_test_build_update.yaml similarity index 79% rename from .github/actions/lint_test_build_update.yaml rename to .github/workflows/reusable_lint_test_build_update.yaml index 8b92e5a..3578f2b 100644 --- a/.github/actions/lint_test_build_update.yaml +++ b/.github/workflows/reusable_lint_test_build_update.yaml @@ -18,18 +18,18 @@ on: jobs: lint: - uses: ./.github/actions/lint.yaml + uses: ./.github/workflows/reusable_lint.yaml test: - uses: ./.github/actions/tests.yaml + uses: ./.github/workflows/reusable_tests.yaml build: needs: [lint, test] - uses: ./.github/actions/build.yaml + uses: ./.github/workflows/reusable_build.yaml secrets: inherit with: repository_url: ${{ inputs.image_repo }} update_tag: needs: [build] - uses: ./.github/actions/update_image.yaml + uses: ./.github/workflows/reusable_update_image.yaml secrets: inherit with: repository: ${{ inputs.configmanagement }} diff --git a/.github/actions/sbom.yaml b/.github/workflows/reusable_sbom.yaml similarity index 100% rename from .github/actions/sbom.yaml rename to .github/workflows/reusable_sbom.yaml diff --git a/.github/actions/tests.yaml b/.github/workflows/reusable_tests.yaml similarity index 100% rename from .github/actions/tests.yaml rename to .github/workflows/reusable_tests.yaml diff --git a/.github/actions/update_image.yaml b/.github/workflows/reusable_update_image.yaml similarity index 100% rename from .github/actions/update_image.yaml rename to .github/workflows/reusable_update_image.yaml