Skip to content

Commit 78ec7a9

Browse files
committed
Revert caching and GH actions
1 parent e395186 commit 78ec7a9

File tree

4 files changed

+13
-52
lines changed

4 files changed

+13
-52
lines changed

.github/workflows/ci-tests.yml

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,8 @@ jobs:
4040
with:
4141
java-version: "8.0.282"
4242

43-
- name: Cache Gradle packages
44-
uses: actions/cache@v2
45-
with:
46-
path: |
47-
~/.gradle/caches
48-
~/.gradle/wrapper
49-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
50-
restore-keys: ${{ runner.os }}-gradle-
51-
52-
- name: Build JAR with Gradle
53-
uses: eskatos/gradle-command-action@v1
54-
with:
55-
arguments: test
43+
- name: Test JAR with Gradle
44+
run: ./gradlew test
5645
env:
5746
GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }}
5847
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Test Build and Changelog
1+
name: Manual Build and Changelog
22

33
on:
44
workflow_dispatch:
@@ -94,7 +94,7 @@ jobs:
9494
path: .github/CHANGELOG.md
9595

9696
jar:
97-
name: Publish JAR
97+
name: Create JAR
9898
runs-on: ubuntu-20.04
9999
needs: [vars, changelog]
100100
steps:
@@ -111,24 +111,12 @@ jobs:
111111
uses: actions/setup-java@v1
112112
with:
113113
java-version: "8.0.282"
114-
115-
- name: Cache Gradle packages
116-
uses: actions/cache@v2
117-
with:
118-
path: ~/.gradle/caches
119-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
120-
restore-keys: ${{ runner.os }}-gradle
121114

122115
- name: Grant execute permission for gradlew
123116
run: chmod +x gradlew
124117

125-
- name: Gradle Dependencies
126-
run: ./gradlew --refresh-dependencies
127-
128118
- name: Build JAR with Gradle
129-
uses: eskatos/gradle-command-action@v1
130-
with:
131-
arguments: build
119+
run: ./gradlew build
132120
env:
133121
GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }}
134122
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/manual-gh-packages.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -113,19 +113,11 @@ jobs:
113113
with:
114114
java-version: "8.0.282"
115115

116-
- name: Cache Gradle packages
117-
uses: actions/cache@v2
118-
with:
119-
path: |
120-
~/.gradle/caches
121-
~/.gradle/wrapper
122-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
123-
restore-keys: ${{ runner.os }}-gradle-
116+
- name: Grant execute permission for gradlew
117+
run: chmod +x gradlew
124118

125-
- name: Build JAR with Gradle
126-
uses: eskatos/gradle-command-action@v1
127-
with:
128-
arguments: publish
119+
- name: Publish JAR with Gradle
120+
run: ./gradlew publish
129121
env:
130122
GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }}
131123
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/tagged-release.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -115,19 +115,11 @@ jobs:
115115
with:
116116
java-version: "8.0.282"
117117

118-
- name: Cache Gradle packages
119-
uses: actions/cache@v2
120-
with:
121-
path: |
122-
~/.gradle/caches
123-
~/.gradle/wrapper
124-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
125-
restore-keys: ${{ runner.os }}-gradle-
118+
- name: Grant execute permission for gradlew
119+
run: chmod +x gradlew
126120

127-
- name: Build JAR with Gradle
128-
uses: eskatos/gradle-command-action@v1
129-
with:
130-
arguments: build
121+
- name: Publish package
122+
run: ./gradlew publish
131123
env:
132124
GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }}
133125
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)