From 842955eadbbf0305eca544b95e34bf6896c7f3fb Mon Sep 17 00:00:00 2001 From: Andrew Kostka Date: Wed, 29 Jan 2025 14:57:37 +0000 Subject: [PATCH 1/3] Clone wbaas-deploy in docker build action --- .github/workflows/docker.build.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/docker.build.yml b/.github/workflows/docker.build.yml index b2a8ff9..073165c 100644 --- a/.github/workflows/docker.build.yml +++ b/.github/workflows/docker.build.yml @@ -54,6 +54,20 @@ jobs: push: true tags: ${{ steps.docker_meta.outputs.tags }} labels: ${{ steps.docker_meta.outputs.labels }} + - + name: Check out `wmde/wbaas-deploy` repository in staging child directory + if: github.event_name != 'pull_request' + uses: actions/checkout@v3.5.3 + with: + repository: wmde/wbaas-deploy + path: ./repos/wbaas-deploy-staging + - + name: Check out `wmde/wbaas-deploy` repository in production child directory + if: github.event_name != 'pull_request' + uses: actions/checkout@v3.5.3 + with: + repository: wmde/wbaas-deploy + path: ./repos/wbaas-deploy-production - name: Update helmfile values for local, staging and production if: github.event_name != 'pull_request' From a5c072d0113e2b689f5e6dec1db481023c3632f8 Mon Sep 17 00:00:00 2001 From: Andrew Kostka Date: Wed, 29 Jan 2025 15:02:18 +0000 Subject: [PATCH 2/3] Try out action in pull request --- .github/workflows/docker.build.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/docker.build.yml b/.github/workflows/docker.build.yml index 073165c..b443bda 100644 --- a/.github/workflows/docker.build.yml +++ b/.github/workflows/docker.build.yml @@ -56,21 +56,18 @@ jobs: labels: ${{ steps.docker_meta.outputs.labels }} - name: Check out `wmde/wbaas-deploy` repository in staging child directory - if: github.event_name != 'pull_request' uses: actions/checkout@v3.5.3 with: repository: wmde/wbaas-deploy path: ./repos/wbaas-deploy-staging - name: Check out `wmde/wbaas-deploy` repository in production child directory - if: github.event_name != 'pull_request' uses: actions/checkout@v3.5.3 with: repository: wmde/wbaas-deploy path: ./repos/wbaas-deploy-production - name: Update helmfile values for local, staging and production - if: github.event_name != 'pull_request' id: update-helmfile-values run: | TAG="$(echo ${{ steps.docker_meta.outputs.tags }} | cut -d':' -f2)" @@ -81,7 +78,6 @@ jobs: # run the values script for local, prod and staging - name: Truncate commit message - if: github.event_name != 'pull_request' id: truncate-commit-message run: | MSG=$(git log -1 --pretty=format:%s) @@ -89,7 +85,6 @@ jobs: - name: Create Staging+Local Pull Request uses: peter-evans/create-pull-request@v5 - if: github.event_name != 'pull_request' with: path: ./repos/wbaas-deploy-staging commit-message: 'Staging+Local: Deploy new Widar image ${{ steps.docker_meta.outputs.tags }}' @@ -106,7 +101,6 @@ jobs: - name: Create Production Pull Request uses: peter-evans/create-pull-request@v5 - if: github.event_name != 'pull_request' with: path: ./repos/wbaas-deploy-production commit-message: 'Production: Deploy new Widar image ${{ steps.docker_meta.outputs.tags }}' From 557f76fb6ecd445e7269a424e8f116a28fac71b3 Mon Sep 17 00:00:00 2001 From: Andrew Kostka Date: Wed, 29 Jan 2025 15:04:40 +0000 Subject: [PATCH 3/3] Revert "Try out action in pull request" This reverts commit a5c072d0113e2b689f5e6dec1db481023c3632f8. --- .github/workflows/docker.build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/docker.build.yml b/.github/workflows/docker.build.yml index b443bda..073165c 100644 --- a/.github/workflows/docker.build.yml +++ b/.github/workflows/docker.build.yml @@ -56,18 +56,21 @@ jobs: labels: ${{ steps.docker_meta.outputs.labels }} - name: Check out `wmde/wbaas-deploy` repository in staging child directory + if: github.event_name != 'pull_request' uses: actions/checkout@v3.5.3 with: repository: wmde/wbaas-deploy path: ./repos/wbaas-deploy-staging - name: Check out `wmde/wbaas-deploy` repository in production child directory + if: github.event_name != 'pull_request' uses: actions/checkout@v3.5.3 with: repository: wmde/wbaas-deploy path: ./repos/wbaas-deploy-production - name: Update helmfile values for local, staging and production + if: github.event_name != 'pull_request' id: update-helmfile-values run: | TAG="$(echo ${{ steps.docker_meta.outputs.tags }} | cut -d':' -f2)" @@ -78,6 +81,7 @@ jobs: # run the values script for local, prod and staging - name: Truncate commit message + if: github.event_name != 'pull_request' id: truncate-commit-message run: | MSG=$(git log -1 --pretty=format:%s) @@ -85,6 +89,7 @@ jobs: - name: Create Staging+Local Pull Request uses: peter-evans/create-pull-request@v5 + if: github.event_name != 'pull_request' with: path: ./repos/wbaas-deploy-staging commit-message: 'Staging+Local: Deploy new Widar image ${{ steps.docker_meta.outputs.tags }}' @@ -101,6 +106,7 @@ jobs: - name: Create Production Pull Request uses: peter-evans/create-pull-request@v5 + if: github.event_name != 'pull_request' with: path: ./repos/wbaas-deploy-production commit-message: 'Production: Deploy new Widar image ${{ steps.docker_meta.outputs.tags }}'