From a527c343716c2bd100c10803e59cd4814fab08a1 Mon Sep 17 00:00:00 2001 From: Alejandro Arroyo Date: Mon, 12 Aug 2024 07:56:36 +0100 Subject: [PATCH 01/10] updating docker compose with gpg sign --- .github/workflows/main.yml | 18 ++++++++++++++++++ _infra/helm/case/Chart.yaml | 4 ++-- docker-compose-down.sh | 1 + docker-compose-up.sh | 1 + docker-compose.yml | 1 - pom.xml | 34 ++++++++++++++++++---------------- 6 files changed, 40 insertions(+), 19 deletions(-) create mode 100755 docker-compose-down.sh create mode 100755 docker-compose-up.sh diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c83cd4a34..8bade2a52 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -84,10 +84,28 @@ jobs: run: | git fetch --tags echo "tag=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV + - name: Import BOT GPG key + run: echo $BOT_GPG_KEY | base64 --decode | gpg --batch --import + env: + BOT_GPG_KEY: ${{ secrets.BOT_GPG_KEY }} + - name: Prepare gpg CLI signing step + run: | + rm -rf /tmp/gpg.sh + echo '#!/bin/bash' >> /tmp/gpg.sh + echo 'gpg --batch --pinentry-mode=loopback --passphrase $BOT_GPG_KEY_PASSPHRASE $@' >> /tmp/gpg.sh + chmod +x /tmp/gpg.sh + - name: Setup git + run: | + git config commit.gpgsign true + git config user.signingkey "${{ secrets.BOT_GPG_KEY_ID }}" + git config gpg.program /tmp/gpg.sh + git config user.name "${{ secrets.BOT_USERNAME }}" + git config user.email "${{ secrets.BOT_EMAIL }}" - name: update versions if: github.ref != 'refs/heads/main' env: GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }} + BOT_GPG_KEY_PASSPHRASE: ${{ secrets.BOT_GPG_KEY_PASSPHRASE }} COMMIT_MSG: | auto patch increment shell: bash diff --git a/_infra/helm/case/Chart.yaml b/_infra/helm/case/Chart.yaml index 6f1dc1ce1..643b2d648 100644 --- a/_infra/helm/case/Chart.yaml +++ b/_infra/helm/case/Chart.yaml @@ -14,9 +14,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 12.0.22 +version: 12.0.23 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: 12.0.22 +appVersion: 12.0.23 diff --git a/docker-compose-down.sh b/docker-compose-down.sh new file mode 100755 index 000000000..1c3e9cae4 --- /dev/null +++ b/docker-compose-down.sh @@ -0,0 +1 @@ +docker compose down \ No newline at end of file diff --git a/docker-compose-up.sh b/docker-compose-up.sh new file mode 100755 index 000000000..e92332ec8 --- /dev/null +++ b/docker-compose-up.sh @@ -0,0 +1 @@ +docker compose up -d \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index bdd14e51a..2d27737c1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,3 @@ -version: '2.1' services: collectionexercise: container_name: collex-case-it diff --git a/pom.xml b/pom.xml index b5a2a7704..654803968 100644 --- a/pom.xml +++ b/pom.xml @@ -216,12 +216,6 @@ ${godaddylogging.version} - - com.dkanejs.maven.plugins - docker-compose-maven-plugin - 4.0.0 - - com.fasterxml.jackson.datatype jackson-datatype-jsr310 @@ -322,6 +316,13 @@ test + + + org.codehaus.mojo + exec-maven-plugin + 3.4.0 + + @@ -330,39 +331,40 @@ - com.dkanejs.maven.plugins - docker-compose-maven-plugin - 4.0.0 + exec-maven-plugin + org.codehaus.mojo pre-stop pre-integration-test - down + exec - ${project.basedir}/docker-compose.yml + ${project.basedir} + docker-compose-down.sh up pre-integration-test - up + exec - ${project.basedir}/docker-compose.yml - true + ${project.basedir} + docker-compose-up.sh down post-integration-test - down + exec - ${project.basedir}/docker-compose.yml + ${project.basedir} + docker-compose-down.sh From 7d122a837555936180690cc9da3bd895d04a7c75 Mon Sep 17 00:00:00 2001 From: Mark Price Date: Tue, 13 Aug 2024 07:47:24 +0100 Subject: [PATCH 02/10] Update Chart.yaml Checking BOT version bump and signing --- _infra/helm/case/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_infra/helm/case/Chart.yaml b/_infra/helm/case/Chart.yaml index 643b2d648..6f1dc1ce1 100644 --- a/_infra/helm/case/Chart.yaml +++ b/_infra/helm/case/Chart.yaml @@ -14,9 +14,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 12.0.23 +version: 12.0.22 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: 12.0.23 +appVersion: 12.0.22 From 6f75b65083680ead0ceaea91e7b7e081037c514b Mon Sep 17 00:00:00 2001 From: ras-rm-pr-bot Date: Tue, 13 Aug 2024 06:52:45 +0000 Subject: [PATCH 03/10] auto patch increment --- _infra/helm/case/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_infra/helm/case/Chart.yaml b/_infra/helm/case/Chart.yaml index 6f1dc1ce1..643b2d648 100644 --- a/_infra/helm/case/Chart.yaml +++ b/_infra/helm/case/Chart.yaml @@ -14,9 +14,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 12.0.22 +version: 12.0.23 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: 12.0.22 +appVersion: 12.0.23 From d539c0ca1cd21cb1e9e937787b4bdd468be13020 Mon Sep 17 00:00:00 2001 From: Mark Price Date: Tue, 13 Aug 2024 08:04:58 +0100 Subject: [PATCH 04/10] Avoid rebuild if BOT bumps Chart.yaml --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8bade2a52..d04c3b189 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,6 +9,8 @@ on: pull_request: branches: - main + paths-ignore: + - '_infra/helm/case/Chart.yaml' env: IMAGE: case From 4fd6dcc5fa0b1efaee939d60a5d0d97b78038100 Mon Sep 17 00:00:00 2001 From: Mark Price Date: Tue, 13 Aug 2024 08:09:13 +0100 Subject: [PATCH 05/10] Update Chart.yaml Testing paths-ignore so BOT version bump doesn't retrigger build --- _infra/helm/case/Chart.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/_infra/helm/case/Chart.yaml b/_infra/helm/case/Chart.yaml index 643b2d648..33fc6652d 100644 --- a/_infra/helm/case/Chart.yaml +++ b/_infra/helm/case/Chart.yaml @@ -14,9 +14,8 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 12.0.23 +version: 12.0.22 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: 12.0.23 - +appVersion: 12.0.22 From c5501c9956ddc47dc8a10532dbf874dc7852375f Mon Sep 17 00:00:00 2001 From: ras-rm-pr-bot Date: Tue, 13 Aug 2024 07:14:46 +0000 Subject: [PATCH 06/10] auto patch increment --- _infra/helm/case/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_infra/helm/case/Chart.yaml b/_infra/helm/case/Chart.yaml index 33fc6652d..674c5d205 100644 --- a/_infra/helm/case/Chart.yaml +++ b/_infra/helm/case/Chart.yaml @@ -14,8 +14,8 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 12.0.22 +version: 12.0.23 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: 12.0.22 +appVersion: 12.0.23 From 8bc72e2311c1402dd6952908a135115627c8676a Mon Sep 17 00:00:00 2001 From: Mark Price Date: Tue, 13 Aug 2024 08:25:55 +0100 Subject: [PATCH 07/10] Try glob pattern for paths-ignore --- .github/workflows/main.yml | 2 +- _infra/helm/case/Chart.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d04c3b189..fc69e278a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,7 @@ on: branches: - main paths-ignore: - - '_infra/helm/case/Chart.yaml' + - '**/helm/case/Chart.yaml' env: IMAGE: case diff --git a/_infra/helm/case/Chart.yaml b/_infra/helm/case/Chart.yaml index 674c5d205..33fc6652d 100644 --- a/_infra/helm/case/Chart.yaml +++ b/_infra/helm/case/Chart.yaml @@ -14,8 +14,8 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 12.0.23 +version: 12.0.22 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: 12.0.23 +appVersion: 12.0.22 From 94d6cef577418a6c686aa0079159529e1966a726 Mon Sep 17 00:00:00 2001 From: ras-rm-pr-bot Date: Tue, 13 Aug 2024 07:31:36 +0000 Subject: [PATCH 08/10] auto patch increment --- _infra/helm/case/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_infra/helm/case/Chart.yaml b/_infra/helm/case/Chart.yaml index 33fc6652d..674c5d205 100644 --- a/_infra/helm/case/Chart.yaml +++ b/_infra/helm/case/Chart.yaml @@ -14,8 +14,8 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 12.0.22 +version: 12.0.23 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: 12.0.22 +appVersion: 12.0.23 From 6cdab1522288eb21a9b09583ed34afdd650fde37 Mon Sep 17 00:00:00 2001 From: Mark Price Date: Tue, 13 Aug 2024 09:00:12 +0100 Subject: [PATCH 09/10] Try a different glob pattern --- .github/workflows/main.yml | 2 +- _infra/helm/case/Chart.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fc69e278a..0e81128a3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,7 @@ on: branches: - main paths-ignore: - - '**/helm/case/Chart.yaml' + - '**/Chart.yaml' env: IMAGE: case diff --git a/_infra/helm/case/Chart.yaml b/_infra/helm/case/Chart.yaml index 674c5d205..33fc6652d 100644 --- a/_infra/helm/case/Chart.yaml +++ b/_infra/helm/case/Chart.yaml @@ -14,8 +14,8 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 12.0.23 +version: 12.0.22 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: 12.0.23 +appVersion: 12.0.22 From 53469ab61372812c5bcb1cd0ed10fbf296d81127 Mon Sep 17 00:00:00 2001 From: ras-rm-pr-bot Date: Tue, 13 Aug 2024 08:05:42 +0000 Subject: [PATCH 10/10] auto patch increment --- _infra/helm/case/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_infra/helm/case/Chart.yaml b/_infra/helm/case/Chart.yaml index 33fc6652d..674c5d205 100644 --- a/_infra/helm/case/Chart.yaml +++ b/_infra/helm/case/Chart.yaml @@ -14,8 +14,8 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 12.0.22 +version: 12.0.23 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: 12.0.22 +appVersion: 12.0.23