Merge pull request com-pas#331 from com-pas/ci/fix-release-please

fix: Release please
energy-projects-renovation-state · Feb 17, 2025 · 6e74242 · 6e74242
2 parents c89657d + ebd5dcc
commit 6e74242
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 16 deletions.
diff --git 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
@@ -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/<tag_name>.
-        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

diff --git a/.release-please-manifest.json 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
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2024 Alliander N.V.
+
+SPDX-License-Identifier: Apache-2.0
diff --git 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
@@ -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 \

diff --git a/release-please-config.json 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
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2024 Alliander N.V.
+
+SPDX-License-Identifier: Apache-2.0
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		SPDX-FileCopyrightText: 2024 Alliander N.V.

		SPDX-License-Identifier: Apache-2.0