Merge pull request #157 from com-pas/small-github-action-changes

Small changes to GitHub Actions
com-pas · Aug 24, 2022 · c573c6d · c573c6d
2 parents dcb9f2e + 2d4570d
commit c573c6d
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 20 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2021 Alliander N.V.
+# SPDX-FileCopyrightText: 2022 Alliander N.V.
 #
 # SPDX-License-Identifier: Apache-2.0
 

diff --git a/.github/workflows/automate-projects.yml b/.github/workflows/automate-projects.yml
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2021 Alliander N.V.
+# SPDX-FileCopyrightText: 2022 Alliander N.V.
 #
 # SPDX-License-Identifier: Apache-2.0
 

diff --git a/.github/workflows/build-project.yml b/.github/workflows/build-project.yml
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2021 Alliander N.V.
+# SPDX-FileCopyrightText: 2022 Alliander N.V.
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -20,12 +20,15 @@ jobs:
     timeout-minutes: 15
 
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
+
       - name: Set up JDK 1.11
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
           java-version: '11'
+
       - name: Create custom Maven Settings.xml
         uses: whelk-io/maven-settings-xml-action@v20
         with:

diff --git a/.github/workflows/release-project.yml b/.github/workflows/release-project.yml
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2021 Alliander N.V.
+# SPDX-FileCopyrightText: 2022 Alliander N.V.
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -15,17 +15,21 @@ jobs:
       contents: read
       packages: write
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
+
       - name: Extract tag name
         id: extract_tagname
         shell: bash
-        # Extra the tagname form the git reference, value of GITHUB_REF will be something like refs/tags/<tag_name>.
+        # 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 1.11
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
           java-version: '11'
+
       - name: Create custom Maven Settings.xml
         uses: whelk-io/maven-settings-xml-action@v20
         with:

diff --git a/.github/workflows/reuse.yml b/.github/workflows/reuse.yml
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2021 RTE FRANCE
+# SPDX-FileCopyrightText: 2022 Alliander N.V.
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -10,6 +10,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - name: REUSE Compliance Check
-      uses: fsfe/reuse-action@v1
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: REUSE Compliance Check
+        uses: fsfe/reuse-action@v1
diff --git a/.github/workflows/sonarcloud-analysis.yml b/.github/workflows/sonarcloud-analysis.yml
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2021 RTE FRANCE
+# SPDX-FileCopyrightText: 2022 Alliander N.V.
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -25,14 +25,10 @@ jobs:
 
     if: ${{ (github.event_name != 'pull_request_target' && github.actor != 'dependabot[bot]') || (github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target') }}
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - name: Set up JDK 1.11
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'zulu'
-          java-version: '11'
 
       - name: Cache SonarCloud packages
         uses: actions/cache@v3
@@ -47,6 +43,12 @@ jobs:
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2
 
+      - name: Set up JDK 1.11
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '11'
+
       - name: Set Common Sonar Variables
         id: sonar_env
         run: |
@@ -70,7 +72,7 @@ jobs:
             -Dsonar.pullrequest.key=${{ github.event.pull_request.number }} \
             -Dsonar.pullrequest.base=${{ github.base_ref }} \
             -Dsonar.scm.revision=${{ github.event.pull_request.head.sha }} \
-            verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
+            clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
       - name: Build and analyze (Push)
         if: ${{ github.event_name == 'push' }}
         env:
@@ -80,4 +82,4 @@ jobs:
           ./mvnw -B -s custom_maven_settings.xml -Psonar \
             ${{ steps.sonar_env.outputs.sonar_opts }} \
             -Dsonar.branch.name=${{ github.ref_name }} \
-            verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
+            clean verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar