Improved GitHub cache management

Author: costas80

.github/workflows/main.yml

@@ -7,7 +7,13 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+        with:
+          path: main
+      - uses: actions/checkout@v3
+        with:
+          repository: ISAITB/itb-commons
+          path: commons
       - name: Set up JDK 11
         uses: actions/setup-java@v2
         with:
@@ -17,9 +23,9 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          key: ${{ runner.os }}-maven-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
-            ${{ runner.os }}-maven-|
+            ${{ runner.os }}-maven-${{ secrets.CACHE_VERSION }}|
       - name: Generate Maven settings
         uses: whelk-io/maven-settings-xml-action@v18
         with:
@@ -44,25 +50,30 @@ jobs:
             [
               "itbRepoRead"
             ]
+      - name: Install commons
+        run: mvn -B install -DskipTests=true
+        working-directory: commons
       - name: Build with Maven
         run: mvn -B package --file pom.xml
+        working-directory: main
       - name: Generate coverage badge
         id: jacoco
         uses: cicirello/jacoco-badge-generator@v2.3.0
         with:
           generate-branches-badge: true
           jacoco-csv-file: >
-            jsonvalidator-common/target/site/jacoco/jacoco.csv
-            jsonvalidator-jar/target/site/jacoco/jacoco.csv
-            jsonvalidator-service/target/site/jacoco/jacoco.csv
-            jsonvalidator-web/target/site/jacoco/jacoco.csv
-            jsonvalidator-war/target/site/jacoco/jacoco.csv
+            main/jsonvalidator-common/target/site/jacoco/jacoco.csv
+            main/jsonvalidator-jar/target/site/jacoco/jacoco.csv
+            main/jsonvalidator-service/target/site/jacoco/jacoco.csv
+            main/jsonvalidator-web/target/site/jacoco/jacoco.csv
+            main/jsonvalidator-war/target/site/jacoco/jacoco.csv
       - name: Log coverage percentage
         run: |
           echo "coverage = ${{ steps.jacoco.outputs.coverage }}"
           echo "branch coverage = ${{ steps.jacoco.outputs.branches }}"
       - name: Commit coverage badge (if changed)
         run: |
+          cd main
           set +e
           if [[ `git status --porcelain` ]]; then
             git config --global user.name 'ISA2ITB'

.github/workflows/quality.yml

@@ -9,9 +9,14 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+          path: main
+      - uses: actions/checkout@v3
+        with:
+          repository: ISAITB/itb-commons
+          path: commons
       - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
@@ -26,8 +31,8 @@ jobs:
         uses: actions/cache@v1
         with:
           path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
+          key: ${{ runner.os }}-m2-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/pom.xml') }}
+          restore-keys: ${{ runner.os }}-m2-${{ secrets.CACHE_VERSION }}
       - name: Generate Maven settings
         uses: whelk-io/maven-settings-xml-action@v18
         with:
@@ -52,8 +57,12 @@ jobs:
             [
               "itbRepoRead"
             ]
+      - name: Install commons
+        run: mvn -B install -DskipTests=true
+        working-directory: commons
       - name: Build and analyze
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=ISAITB_json-validator
+        run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=ISAITB_json-validator
+        working-directory: main