Skip to content

Commit 4de4dc4

Browse files
committed
Patch 2: caching and ver as env var
1 parent 4e2eca2 commit 4de4dc4

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ on:
55
pull_request:
66
types: [opened, reopened]
77

8+
env:
9+
JACOCO_VERSION: "0.8.14"
10+
811
jobs:
912
build:
1013
runs-on: ubuntu-latest
@@ -22,10 +25,8 @@ jobs:
2225
id: cache-jacoco
2326
uses: actions/cache@v4
2427
with:
25-
path: ~/jacoco-0.8.14
26-
key: ${{ runner.os }}-jacoco-cli-${{ hashFiles('generate-jacoco-report.sh') }}
27-
restore-keys: |
28-
${{ runner.os }}-jacoco-cli-
28+
path: ${{ github.workspace }}/jacoco-${{ env.JACOCO_VERSION }}
29+
key: ${{ runner.os }}-jacoco-cli-${{ env.JACOCO_VERSION }}
2930

3031
- name: Build with Maven
3132
run: mvn --batch-mode --update-snapshots package

generate-jacoco-report.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Define paths
44
PROJECT_ROOT="${PROJECT_ROOT:-$(pwd)}"
5-
JACOCO_VERSION="0.8.14"
5+
JACOCO_VERSION="${JACOCO_VERSION:-0.8.14}" #fallback to 0.8.14 if env var is unset
66
JACOCO_DIR="${PROJECT_ROOT}/jacoco-$JACOCO_VERSION"
77
JACOCO_CLI_JAR="$JACOCO_DIR/lib/jacococli.jar"
88
MERGED_EXEC="$PROJECT_ROOT/target/coverage-reports/merged.exec"

get-jacoco.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Define paths
44
PROJECT_ROOT="${PROJECT_ROOT:-$(pwd)}"
5-
JACOCO_VERSION="0.8.14"
5+
JACOCO_VERSION="${JACOCO_VERSION:-0.8.14}" #fallback to 0.8.14 if env var is unset
66
JACOCO_DIR="${PROJECT_ROOT}/jacoco-$JACOCO_VERSION"
77
JACOCO_CLI_JAR="$JACOCO_DIR/lib/jacococli.jar"
88

0 commit comments

Comments
 (0)