Upgrade github actions cache and use m2 cache for integration testing as well

This commit is contained in:
Martin Kanters 2020-12-05 17:10:35 +01:00 committed by Martin Kanters
parent d8c2cc7e4a
commit 2ef0e5bacc
1 changed files with 11 additions and 3 deletions

View File

@ -32,8 +32,8 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Set up cache for ~./m2/repository - name: Set up cache for ~/.m2/repository
uses: actions/cache@v1 uses: actions/cache@v2
with: with:
path: ~/.m2/repository path: ~/.m2/repository
key: maven-${{ matrix.os }}-${{ hashFiles('**/pom.xml') }} key: maven-${{ matrix.os }}-${{ hashFiles('**/pom.xml') }}
@ -110,6 +110,14 @@ jobs:
path: maven-integration-testing/ path: maven-integration-testing/
ref: ${{ env.REPO_BRANCH }} ref: ${{ env.REPO_BRANCH }}
- name: Set up cache for ~/.m2/repository
uses: actions/cache@v2
with:
path: ~/.m2/repository
key: it-m2-repo-${{ matrix.os }}-${{ hashFiles('maven-integration-testing/**/pom.xml') }}
restore-keys: |
it-m2-repo-${{ matrix.os }}-
- name: Download built Maven - name: Download built Maven
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
@ -129,4 +137,4 @@ jobs:
- name: Running integration tests - name: Running integration tests
shell: bash shell: bash
run: mvn install -e -B -V -Prun-its,embedded -Dmaven.repo.local=$GITHUB_WORKSPACE/repo/ -DmavenDistro="$GITHUB_WORKSPACE/built-maven/apache-maven-bin.zip" -DwrapperDistroDir="$GITHUB_WORKSPACE/built-maven/" -DmavenWrapper="$GITHUB_WORKSPACE/built-maven-wrapper/maven-wrapper.jar" -f maven-integration-testing/pom.xml run: mvn install -e -B -V -Prun-its,embedded -Dmaven.repo.local="$HOME/.m2/repository" -DmavenDistro="$GITHUB_WORKSPACE/built-maven/apache-maven-bin.zip" -DwrapperDistroDir="$GITHUB_WORKSPACE/built-maven/" -DmavenWrapper="$GITHUB_WORKSPACE/built-maven-wrapper/maven-wrapper.jar" -f maven-integration-testing/pom.xml