Skip to content

Commit 0c44fcc

Browse files
authored
Merge branch 'develop' into dependabot/maven/com.powsybl-powsybl-single-line-diagram-core-4.0.0
2 parents ba91264 + 6240c74 commit 0c44fcc

File tree

5 files changed

+21
-16
lines changed

5 files changed

+21
-16
lines changed

.github/workflows/release-please.yml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,68 +15,67 @@ name: release-please
1515
jobs:
1616
release_please:
1717
runs-on: ubuntu-latest
18-
outputs:
19-
release_created: ${{ steps.release.outputs.release_created }}
2018
steps:
21-
- uses: google-github-actions/release-please-action@v3
19+
- uses: google-github-actions/release-please-action@v4
2220
id: release
2321
with:
2422
release-type: maven
2523
package-name: compas-scl-auto-alignment
26-
# The logic below handles the docker hub publication:
27-
push_to_registry:
28-
needs: release_please
29-
if: needs.release_please.outputs.release_created == "true"
30-
name: Build and publish
31-
runs-on: ubuntu-latest
32-
timeout-minutes: 15
33-
34-
steps:
3524
- name: Checkout
25+
if: ${{ steps.release.outputs.release_created }}
3626
uses: actions/checkout@v4
3727

3828
- name: Cache Docker Register
29+
if: ${{ steps.release.outputs.release_created }}
3930
uses: actions/cache@v3
4031
with:
4132
path: /tmp/.buildx-cache
4233
key: ${{ runner.os }}-buildx-${{ hashFiles('**/Dockerfile') }}
4334
- name: Cache Maven packages
35+
if: ${{ steps.release.outputs.release_created }}
4436
uses: actions/cache@v3
4537
with:
4638
path: ~/.m2
4739
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
4840
restore-keys: ${{ runner.os }}-m2
4941

5042
- name: Extract tag name
43+
if: ${{ steps.release.outputs.release_created }}
5144
id: extract_tagname
5245
shell: bash
5346
# Extract the tag name from the git reference, value of GITHUB_REF will be something like refs/tags/<tag_name>.
5447
run: echo "##[set-output name=tagname;]$(echo ${GITHUB_REF##*/})"
5548

5649
- name: Set up JDK 17
50+
if: ${{ steps.release.outputs.release_created }}
5751
uses: actions/setup-java@v4
5852
with:
5953
distribution: 'zulu'
6054
java-version: '17'
6155
- name: Set up Docker Buildx
56+
if: ${{ steps.release.outputs.release_created }}
6257
id: buildx
6358
uses: docker/setup-buildx-action@v3
6459
- name: Login to Docker Hub
60+
if: ${{ steps.release.outputs.release_created }}
6561
uses: docker/login-action@v3
6662
with:
6763
username: ${{ secrets.DOCKER_HUB_USERNAME }}
6864
password: ${{ secrets.DOCKER_HUB_TOKEN }}
6965

7066
- name: Create custom Maven Settings.xml
67+
if: ${{ steps.release.outputs.release_created }}
7168
uses: whelk-io/maven-settings-xml-action@v21
7269
with:
7370
output_file: custom_maven_settings.xml
7471
servers: '[{ "id": "github-packages-compas", "username": "OWNER", "password": "${{ secrets.GITHUB_TOKEN }}" }]'
7572
- name: Set version with Maven
73+
if: ${{ steps.release.outputs.release_created }}
7674
run: ./mvnw -B versions:set -DprocessAllModules=true -DnewVersion=${{ steps.extract_tagname.outputs.tagname }}
7775
env:
7876
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7977
- name: Deploy with Maven to GitHub Packages and Docker Hub
78+
if: ${{ steps.release.outputs.release_created }}
8079
run: ./mvnw -B -s custom_maven_settings.xml -Pnative-image,release clean deploy
8180
env:
8281
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/sonarcloud-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
run: cat $GITHUB_EVENT_PATH
2020
- name: Download PR number artifact
2121
if: github.event.workflow_run.event == 'pull_request'
22-
uses: dawidd6/action-download-artifact@v2
22+
uses: dawidd6/action-download-artifact@v3
2323
with:
2424
workflow: SonarCloud Build
2525
run_id: ${{ github.event.workflow_run.id }}

.github/workflows/sonarcloud-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
run: echo ${{ github.event.number }} > PR_NUMBER.txt
7272
- name: Archive PR number
7373
if: github.event_name == 'pull_request'
74-
uses: actions/upload-artifact@v3
74+
uses: actions/upload-artifact@v4
7575
with:
7676
name: PR_NUMBER
7777
path: PR_NUMBER.txt

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<!--
2+
SPDX-FileCopyrightText: 2023 Alliander N.V.
3+
4+
SPDX-License-Identifier: Apache-2.0
5+
-->
6+
For older changelogs, please check the release tag on GitHub.

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ SPDX-License-Identifier: Apache-2.0
2020
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2121

2222
<compiler-plugin.version>3.11.0</compiler-plugin.version>
23-
<surefire-plugin.version>3.2.2</surefire-plugin.version>
23+
<surefire-plugin.version>3.2.3</surefire-plugin.version>
2424
<sonarqube-plugin.version>3.2.0</sonarqube-plugin.version>
2525

2626
<compas.core.version>0.16.0</compas.core.version>
2727

28-
<quarkus.platform.version>3.6.1</quarkus.platform.version>
28+
<quarkus.platform.version>3.6.3</quarkus.platform.version>
2929
<log4j2.version>2.22.0</log4j2.version>
3030
<powsybl.sld.version>4.0.0</powsybl.sld.version>
3131
<gson.version>2.10.1</gson.version>

0 commit comments

Comments
 (0)