From 0acf7535964c3e280a506c72c56a6b1eb9419e57 Mon Sep 17 00:00:00 2001 From: Christopher Lepski Date: Mon, 17 Feb 2025 10:24:52 +0100 Subject: [PATCH 1/4] ci: Add release please config Signed-off-by: Christopher Lepski --- .release-please-manifest.json | 3 +++ .release-please-manifest.json.license | 3 +++ release-please-config.json | 12 ++++++++++++ release-please-config.json.license | 3 +++ 4 files changed, 21 insertions(+) create mode 100644 .release-please-manifest.json create mode 100644 .release-please-manifest.json.license create mode 100644 release-please-config.json create mode 100644 release-please-config.json.license diff --git a/.release-please-manifest.json b/.release-please-manifest.json new file mode 100644 index 0000000..210d290 --- /dev/null +++ b/.release-please-manifest.json @@ -0,0 +1,3 @@ +{ + ".": "0.5.1" +} diff --git a/.release-please-manifest.json.license b/.release-please-manifest.json.license new file mode 100644 index 0000000..9ab6622 --- /dev/null +++ b/.release-please-manifest.json.license @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: 2024 Alliander N.V. + +SPDX-License-Identifier: Apache-2.0 diff --git a/release-please-config.json b/release-please-config.json new file mode 100644 index 0000000..1c1ced4 --- /dev/null +++ b/release-please-config.json @@ -0,0 +1,12 @@ +{ + "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json", + "bootstrap-sha": "2dda752cf0d0ed71492731d76ff83acd4f903e10", + "include-component-in-tag": false, + "packages": { + ".": { + "release-type": "maven", + "package-name": "compas-scl-auto-alignment", + "initial-version": "0.5.1" + } + } +} diff --git a/release-please-config.json.license b/release-please-config.json.license new file mode 100644 index 0000000..9ab6622 --- /dev/null +++ b/release-please-config.json.license @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: 2024 Alliander N.V. + +SPDX-License-Identifier: Apache-2.0 From 5f469d8c0999ee099c28b47f03a3b45a0905ebd5 Mon Sep 17 00:00:00 2001 From: Christopher Lepski Date: Mon, 17 Feb 2025 10:25:50 +0100 Subject: [PATCH 2/4] chore: Bump ubi docker image to 8.10-1154 Signed-off-by: Christopher Lepski --- app/src/main/docker/Dockerfile.jvm | 2 +- app/src/main/docker/Dockerfile.native | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/docker/Dockerfile.jvm b/app/src/main/docker/Dockerfile.jvm index 8e2bb94..7a2a030 100644 --- a/app/src/main/docker/Dockerfile.jvm +++ b/app/src/main/docker/Dockerfile.jvm @@ -21,7 +21,7 @@ # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/app-jvm # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9-1161 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1154 ARG JAVA_PACKAGE=java-17-openjdk-headless ARG RUN_JAVA_VERSION=1.3.8 diff --git a/app/src/main/docker/Dockerfile.native b/app/src/main/docker/Dockerfile.native index 9a23be8..90c502b 100644 --- a/app/src/main/docker/Dockerfile.native +++ b/app/src/main/docker/Dockerfile.native @@ -14,7 +14,7 @@ # docker run -i --rm -p 8080:8080 quarkus/app # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal:8.9-1161 +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1154 WORKDIR /work/ RUN chown 1001 /work \ && chmod "g+rwX" /work \ From 7a944f93de9abc9f3643f91cc491cf8c64eb0ba5 Mon Sep 17 00:00:00 2001 From: Christopher Lepski Date: Mon, 17 Feb 2025 10:29:17 +0100 Subject: [PATCH 3/4] fix: Remove set version Signed-off-by: Christopher Lepski --- .github/workflows/release-please.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 3e265c1..b220aa9 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -39,13 +39,6 @@ jobs: key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - - name: Extract tag name - if: ${{ steps.release.outputs.release_created }} - id: extract_tagname - shell: bash - # Extract the tag name from the git reference, value of GITHUB_REF will be something like refs/tags/. - run: echo "##[set-output name=tagname;]$(echo ${GITHUB_REF##*/})" - - name: Set up JDK 17 if: ${{ steps.release.outputs.release_created }} uses: actions/setup-java@v4 @@ -69,11 +62,6 @@ jobs: with: output_file: custom_maven_settings.xml servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]' - - name: Set version with Maven - if: ${{ steps.release.outputs.release_created }} - run: ./mvnw -B versions:set -DprocessAllModules=true -DnewVersion=${{ steps.extract_tagname.outputs.tagname }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Deploy with Maven to GitHub Packages and Docker Hub if: ${{ steps.release.outputs.release_created }} run: ./mvnw -B -s custom_maven_settings.xml -Pnative-image,release clean deploy From ebd5dccfdea8123efd6bc000e705a45e0f6acbdf Mon Sep 17 00:00:00 2001 From: Christopher Lepski Date: Mon, 17 Feb 2025 10:33:59 +0100 Subject: [PATCH 4/4] ci: Adjust release please action Signed-off-by: Christopher Lepski --- .github/workflows/release-please.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index b220aa9..bccbe0b 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -8,6 +8,7 @@ on: permissions: contents: write + packages: write pull-requests: write name: release-please @@ -19,8 +20,7 @@ jobs: - uses: google-github-actions/release-please-action@v4 id: release with: - release-type: maven - package-name: compas-scl-auto-alignment + target-branch: main - name: Checkout if: ${{ steps.release.outputs.release_created }} uses: actions/checkout@v4