diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c83cd4a34..0e81128a3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,6 +9,8 @@ on: pull_request: branches: - main + paths-ignore: + - '**/Chart.yaml' env: IMAGE: case @@ -84,10 +86,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 643b2d648..674c5d205 100644 --- a/_infra/helm/case/Chart.yaml +++ b/_infra/helm/case/Chart.yaml @@ -19,4 +19,3 @@ 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.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