Skip to content

Commit d43b8e0

Browse files
authored
Merge pull request #367 from ghostbuster91/simplify-ci-setup
CI: replace custom action with coursier-cache and remove cleanup step
2 parents 879623e + 3e6536c commit d43b8e0

File tree

1 file changed

+6
-40
lines changed

1 file changed

+6
-40
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,13 @@ jobs:
2020
with:
2121
java-version: 11
2222
- name: Cache sbt
23-
uses: actions/cache@v2
23+
uses: coursier/cache-action@v6
2424
with:
25-
path: |
26-
~/.sbt
27-
~/.ivy2/cache
28-
~/.coursier
29-
key: sbt-cache-${{ runner.os }}-${{ hashFiles('project/build.properties') }}
25+
extraKey: sbt-cache-${{ runner.os }}
3026
- name: Compile
3127
run: sbt -v compile
3228
- name: Test
3329
run: sbt -v test
34-
- name: Cleanup
35-
run: |
36-
rm -rf "$HOME/.ivy2/local" || true
37-
find $HOME/.ivy2/cache -name "ivydata-*.properties" -delete || true
38-
find $HOME/.ivy2/cache -name "*-LM-SNAPSHOT*" -delete || true
39-
find $HOME/.cache/coursier/v1 -name "ivydata-*.properties" -delete || true
40-
find $HOME/.sbt -name "*.lock" -delete || true
4130

4231
mima:
4332
# run on external PRs, but not on internal PRs since those will be run by push to branch
@@ -55,22 +44,11 @@ jobs:
5544
with:
5645
java-version: 11
5746
- name: Cache sbt
58-
uses: actions/cache@v2
47+
uses: coursier/cache-action@v6
5948
with:
60-
path: |
61-
~/.sbt
62-
~/.ivy2/cache
63-
~/.coursier
64-
key: sbt-cache-${{ runner.os }}-${{ hashFiles('project/build.properties') }}
49+
extraKey: sbt-cache-${{ runner.os }}
6550
- name: Check MiMa # disable for major releases
6651
run: sbt -v core3/mimaReportBinaryIssues
67-
- name: Cleanup
68-
run: |
69-
rm -rf "$HOME/.ivy2/local" || true
70-
find $HOME/.ivy2/cache -name "ivydata-*.properties" -delete || true
71-
find $HOME/.ivy2/cache -name "*-LM-SNAPSHOT*" -delete || true
72-
find $HOME/.cache/coursier/v1 -name "ivydata-*.properties" -delete || true
73-
find $HOME/.sbt -name "*.lock" -delete || true
7452

7553
publish:
7654
name: Publish release
@@ -88,13 +66,8 @@ jobs:
8866
with:
8967
java-version: 11
9068
- name: Cache sbt
91-
uses: actions/cache@v2
92-
with:
93-
path: |
94-
~/.sbt
95-
~/.ivy2/cache
96-
~/.coursier
97-
key: sbt-cache-release-${{ runner.os }}-${{ hashFiles('project/build.properties') }}
69+
uses: coursier/cache-action@v6
70+
extraKey: sbt-cache-release-${{ runner.os }}
9871
- name: Compile
9972
run: sbt compile
10073
- name: Publish artifacts
@@ -120,10 +93,3 @@ jobs:
12093
version: "v${{ env.VERSION }}"
12194
env:
12295
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
123-
- name: Cleanup
124-
run: |
125-
rm -rf "$HOME/.ivy2/local" || true
126-
find $HOME/.ivy2/cache -name "ivydata-*.properties" -delete || true
127-
find $HOME/.ivy2/cache -name "*-LM-SNAPSHOT*" -delete || true
128-
find $HOME/.cache/coursier/v1 -name "ivydata-*.properties" -delete || true
129-
find $HOME/.sbt -name "*.lock" -delete || true

0 commit comments

Comments
 (0)