Skip to content

Commit ce82d6c

Browse files
author
Dennis Labordus
committed
Fixed GitHub Actions.
Signed-off-by: Dennis Labordus <[email protected]>
1 parent e6a2e33 commit ce82d6c

File tree

4 files changed

+22
-18
lines changed

4 files changed

+22
-18
lines changed

.github/workflows/automate-projects.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-FileCopyrightText: 2021 Alliander N.V.
1+
# SPDX-FileCopyrightText: 2022 Alliander N.V.
22
#
33
# SPDX-License-Identifier: Apache-2.0
44

.github/workflows/build-project.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ jobs:
2424
uses: actions/checkout@v3
2525
with:
2626
submodules: 'true'
27-
- name: Set up Docker Buildx
28-
id: buildx
29-
uses: docker/setup-buildx-action@v2
27+
3028
- name: Cache Docker Register
3129
uses: actions/cache@v3
3230
with:
@@ -39,6 +37,9 @@ jobs:
3937
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
4038
restore-keys: ${{ runner.os }}-m2
4139

40+
- name: Set up Docker Buildx
41+
id: buildx
42+
uses: docker/setup-buildx-action@v2
4243
- name: Set up JDK 17
4344
uses: actions/setup-java@v3
4445
with:

.github/workflows/release-project.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,7 @@ jobs:
1919
uses: actions/checkout@v3
2020
with:
2121
submodules: 'true'
22-
- name: Set up Docker Buildx
23-
id: buildx
24-
uses: docker/setup-buildx-action@v2
25-
- name: Login to Docker Hub
26-
uses: docker/login-action@v2
27-
with:
28-
username: ${{ secrets.DOCKER_HUB_USERNAME }}
29-
password: ${{ secrets.DOCKER_HUB_TOKEN }}
22+
3023
- name: Cache Docker Register
3124
uses: actions/cache@v3
3225
with:
@@ -42,13 +35,22 @@ jobs:
4235
- name: Extract tag name
4336
id: extract_tagname
4437
shell: bash
45-
# Extra the tagname form the git reference, value of GITHUB_REF will be something like refs/tags/<tag_name>.
38+
# Extract the tag name from the git reference, value of GITHUB_REF will be something like refs/tags/<tag_name>.
4639
run: echo "##[set-output name=tagname;]$(echo ${GITHUB_REF##*/})"
40+
4741
- name: Set up JDK 17
4842
uses: actions/setup-java@v3
4943
with:
5044
distribution: 'zulu'
5145
java-version: '17'
46+
- name: Set up Docker Buildx
47+
id: buildx
48+
uses: docker/setup-buildx-action@v2
49+
- name: Login to Docker Hub
50+
uses: docker/login-action@v2
51+
with:
52+
username: ${{ secrets.DOCKER_HUB_USERNAME }}
53+
password: ${{ secrets.DOCKER_HUB_TOKEN }}
5254

5355
- name: Create custom Maven Settings.xml
5456
uses: whelk-io/maven-settings-xml-action@v20

.github/workflows/sonarcloud-analysis.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@ jobs:
3030
with:
3131
fetch-depth: 0
3232
submodules: 'true'
33-
- name: Set up JDK 17
34-
uses: actions/setup-java@v3
35-
with:
36-
distribution: 'zulu'
37-
java-version: '17'
3833

3934
- name: Cache SonarCloud packages
4035
uses: actions/cache@v3
@@ -49,6 +44,12 @@ jobs:
4944
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
5045
restore-keys: ${{ runner.os }}-m2
5146

47+
- name: Set up JDK 17
48+
uses: actions/setup-java@v3
49+
with:
50+
distribution: 'zulu'
51+
java-version: '17'
52+
5253
- name: Set Common Sonar Variables
5354
id: sonar_env
5455
run: |

0 commit comments

Comments
 (0)