Skip to content

Commit cb130f7

Browse files
John Burnswakingrufus
authored andcommitted
fix pom contacts metadata
improve gradle caching actions
1 parent ce43ffb commit cb130f7

File tree

3 files changed

+16
-55
lines changed

3 files changed

+16
-55
lines changed

.github/workflows/nebula.yml

Lines changed: 9 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,8 @@ on:
99
pull_request:
1010

1111
jobs:
12-
validation:
13-
name: "Gradle Wrapper Validation"
14-
runs-on: ubuntu-latest
15-
steps:
16-
- uses: actions/checkout@v4
17-
- uses: gradle/wrapper-validation-action@v1
1812
buildmultijdk:
1913
if: (!startsWith(github.ref, 'refs/tags/v'))
20-
needs: validation
2114
runs-on: ubuntu-latest
2215
strategy:
2316
matrix:
@@ -38,27 +31,16 @@ jobs:
3831
17
3932
${{ matrix.java }}
4033
java-package: jdk
41-
- uses: actions/cache@v4
42-
id: gradle-cache
34+
- name: Setup Gradle
35+
uses: gradle/actions/setup-gradle@v5
4336
with:
44-
path: ~/.gradle/caches
45-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/gradle/dependency-locks/*.lockfile') }}
46-
restore-keys: |
47-
- ${{ runner.os }}-gradle-
48-
- uses: actions/cache@v4
49-
id: gradle-wrapper-cache
50-
with:
51-
path: ~/.gradle/wrapper
52-
key: ${{ runner.os }}-gradlewrapper-${{ hashFiles('gradle/wrapper/*') }}
53-
restore-keys: |
54-
- ${{ runner.os }}-gradlewrapper-
37+
cache-overwrite-existing: true
5538
- name: Gradle build
5639
run: ./gradlew --info --stacktrace build
5740
env:
5841
JDK_VERSION_FOR_TESTS: ${{ matrix.java }}
5942
validatepluginpublication:
6043
if: startsWith(github.ref, 'refs/tags/v')
61-
needs: validation
6244
runs-on: ubuntu-latest
6345
name: Gradle Plugin Publication Validation
6446
env:
@@ -78,20 +60,10 @@ jobs:
7860
17
7961
21
8062
java-package: jdk
81-
- uses: actions/cache@v4
82-
id: gradle-cache
83-
with:
84-
path: ~/.gradle/caches
85-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/gradle/dependency-locks/*.lockfile') }}
86-
restore-keys: |
87-
- ${{ runner.os }}-gradle-
88-
- uses: actions/cache@v4
89-
id: gradle-wrapper-cache
63+
- name: Setup Gradle
64+
uses: gradle/actions/setup-gradle@v5
9065
with:
91-
path: ~/.gradle/wrapper
92-
key: ${{ runner.os }}-gradlewrapper-${{ hashFiles('gradle/wrapper/*') }}
93-
restore-keys: |
94-
- ${{ runner.os }}-gradlewrapper-
66+
cache-overwrite-existing: true
9567
- name: Verify plugin publication
9668
if: |
9769
startsWith(github.ref, 'refs/tags/v') &&
@@ -123,20 +95,10 @@ jobs:
12395
17
12496
21
12597
java-package: jdk
126-
- uses: actions/cache@v4
127-
id: gradle-cache
128-
with:
129-
path: ~/.gradle/caches
130-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/gradle/dependency-locks/*.lockfile') }}
131-
restore-keys: |
132-
- ${{ runner.os }}-gradle-
133-
- uses: actions/cache@v4
134-
id: gradle-wrapper-cache
98+
- name: Setup Gradle
99+
uses: gradle/actions/setup-gradle@v5
135100
with:
136-
path: ~/.gradle/wrapper
137-
key: ${{ runner.os }}-gradlewrapper-${{ hashFiles('gradle/wrapper/*') }}
138-
restore-keys: |
139-
- ${{ runner.os }}-gradlewrapper-
101+
cache-overwrite-existing: true
140102
- name: Publish candidate
141103
if: |
142104
startsWith(github.ref, 'refs/tags/v') &&

build.gradle.kts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,11 @@ plugins {
44

55
dependencyLocking {
66
lockAllConfigurations()
7+
}
8+
9+
contacts {
10+
addPerson("nebula-plugins-oss@netflix.com") {
11+
moniker = "Nebula Plugins Maintainers"
12+
github = "nebula-plugins"
13+
}
714
}

gradle-nothing-plugin/build.gradle

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,6 @@ gradlePlugin {
3737
}
3838
}
3939

40-
41-
contacts {
42-
'nebula-plugins-oss@netflix.com' {
43-
moniker 'Nebula Plugins Maintainers'
44-
github 'nebula-plugins'
45-
}
46-
}
47-
4840
publishing {
4941
repositories {
5042
maven {

0 commit comments

Comments
 (0)