Skip to content

Commit c56a08a

Browse files
jruauxjruaux
committed
[chore] Upgraded to Kordamp Gradle Plugins 0.47.0
1 parent ae88646 commit c56a08a

File tree

8 files changed

+208
-278
lines changed

8 files changed

+208
-278
lines changed

‎.github/workflows/build.yml‎

Lines changed: 5 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6,38 +6,13 @@ on:
66
jobs:
77
build:
88
name: Build
9-
runs-on: ubuntu-18.04
109
if: startsWith(github.event.head_commit.message, 'Releasing version') != true
11-
10+
runs-on: ubuntu-latest
1211
steps:
13-
- uses: actions/checkout@v2
14-
15-
- name: Set up Java
16-
uses: actions/setup-java@v2
17-
with:
18-
java-version: 11
19-
distribution: 'zulu'
20-
21-
- uses: actions/cache@v2
22-
with:
23-
path: ~/.gradle/caches
24-
key: ${{ runner.os }}-gradle-cache-${{ hashFiles('**/*.gradle') }}-${{ hashFiles('**/gradle.properties') }}
25-
restore-keys: |
26-
${{ runner.os }}-gradle-
27-
28-
- uses: actions/cache@v2
29-
with:
30-
path: ~/.gradle/wrapper
31-
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradlew') }}
32-
restore-keys: |
33-
${{ runner.os }}-gradlew-
12+
- name: Checkout
13+
uses: actions/checkout@v2
3414

3515
- name: Build
36-
run: ./gradlew build -S
37-
38-
- name: Show Reports
39-
uses: actions/upload-artifact@v1
40-
if: failure()
16+
uses: redis-field-engineering/redis-build-action@v1
4117
with:
42-
name: reports-${{ runner.os }}
43-
path: build/
18+
release: false

‎.github/workflows/early-access.yml‎

Lines changed: 12 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -7,73 +7,20 @@ on:
77
jobs:
88
earlyaccess:
99
name: EarlyAccess
10-
if: github.repository == 'redis-developer/testcontainers-redis' && startsWith(github.event.head_commit.message, 'Releasing version') != true
11-
runs-on: ubuntu-18.04
10+
if: startsWith(github.event.head_commit.message, 'Releasing version') != true
11+
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout
1414
uses: actions/checkout@v2
15-
with:
16-
fetch-depth: 0
17-
18-
- name: Set up Java
19-
uses: actions/setup-java@v2
20-
with:
21-
java-version: 11
22-
distribution: 'zulu'
23-
24-
- uses: actions/cache@v2
25-
with:
26-
path: ~/.gradle/caches
27-
key: ${{ runner.os }}-gradle-cache-${{ hashFiles('**/*.gradle') }}-${{ hashFiles('**/gradle.properties') }}
28-
restore-keys: |
29-
${{ runner.os }}-gradle-
30-
31-
- uses: actions/cache@v2
32-
with:
33-
path: ~/.gradle/wrapper
34-
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradlew') }}
35-
restore-keys: |
36-
${{ runner.os }}-gradlew-
37-
38-
- name: Build
39-
run: ./gradlew -Prelease=true build -S
40-
41-
- name: Show Reports
42-
uses: actions/upload-artifact@v1
43-
if: failure()
44-
with:
45-
name: reports-${{ runner.os }}
46-
path: subprojects/testcontainers-redis/build/reports
47-
48-
- name: Version
49-
id: vars
50-
run: echo ::set-output name=version::$(cat VERSION)
51-
52-
- name: Assemble
53-
uses: jreleaser/release-action@v1
54-
with:
55-
arguments: assemble
56-
env:
57-
JRELEASER_PROJECT_VERSION: ${{ steps.vars.outputs.version }}
58-
JRELEASER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5915

6016
- name: Release
61-
uses: jreleaser/release-action@v1
62-
with:
63-
arguments: full-release
64-
env:
65-
JRELEASER_PROJECT_VERSION: ${{ steps.vars.outputs.version }}
66-
JRELEASER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
67-
JRELEASER_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
68-
JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }}
69-
JRELEASER_GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
70-
JRELEASER_DOCKER_DEFAULT_PASSWORD: ${{ secrets.JRELEASER_DOCKER_PASSWORD }}
71-
72-
- name: JReleaser output
73-
if: always()
74-
uses: actions/upload-artifact@v2
75-
with:
76-
name: artifact
77-
path: |
78-
out/jreleaser/trace.log
79-
out/jreleaser/output.properties
17+
uses: redis-field-engineering/redis-release-action@v1
18+
with:
19+
gpg-key-id: ${{ secrets.GPG_KEY_ID }}
20+
gpg-public-key: ${{ secrets.GPG_PUBLIC_KEY }}
21+
gpg-secret-key: ${{ secrets.GPG_SECRET_KEY }}
22+
gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }}
23+
sonatype-username: ${{ secrets.SONATYPE_USERNAME }}
24+
sonatype-password: ${{ secrets.SONATYPE_PASSWORD }}
25+
github-token: ${{ secrets.GITHUB_TOKEN }}
26+
slack-webhook: ${{ secrets.JRELEASER_SLACK_WEBHOOK }}

‎.github/workflows/release.yml‎

Lines changed: 22 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -9,86 +9,35 @@ on:
99
jobs:
1010
release:
1111
name: Release
12-
runs-on: ubuntu-18.04
12+
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v2
15-
with:
16-
fetch-depth: 0
17-
18-
- name: Set up Java
19-
uses: actions/setup-java@v2
20-
with:
21-
java-version: 11
22-
distribution: 'zulu'
14+
- name: Checkout
15+
uses: actions/checkout@v2
2316

24-
- uses: actions/cache@v2
25-
with:
26-
path: ~/.gradle/caches
27-
key: ${{ runner.os }}-gradle-cache-${{ hashFiles('**/*.gradle') }}-${{ hashFiles('**/gradle.properties') }}
28-
restore-keys: |
29-
${{ runner.os }}-gradle-
30-
31-
- uses: actions/cache@v2
17+
- name: Release
18+
uses: redis-field-engineering/redis-release-version-action@v1
3219
with:
33-
path: ~/.gradle/wrapper
34-
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradlew') }}
35-
restore-keys: |
36-
${{ runner.os }}-gradlew-
20+
version: ${{ github.event.inputs.version }}
3721

38-
- name: Set release version
39-
run: |
40-
VERSION=${{ github.event.inputs.version }}
41-
echo $VERSION > VERSION
42-
sed -i -e "s/^\:project-version\:\ .*/:project-version: $VERSION/g" README.adoc
43-
git add VERSION
44-
git add README.adoc
45-
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
46-
git config --global user.name "GitHub Action"
47-
git commit -a -m "Releasing version $VERSION"
48-
git push origin master
49-
50-
- name: Build
51-
run: |
52-
./gradlew -Prelease=true build -S
53-
54-
- name: Deploy
55-
env:
56-
GITHUB_USERNAME: jruaux
57-
GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
58-
GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
59-
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
22+
- name: CreateGuide
6023
run: |
6124
./gradlew -Prelease=true -Pfull-release=true \
62-
-PsonatypeUsername=${{ secrets.SONATYPE_USERNAME }} \
63-
-PsonatypePassword=${{ secrets.SONATYPE_PASSWORD }} \
64-
build publishToSonatype closeAndReleaseSonatypeStagingRepository -S
65-
66-
- name: Assemble
67-
uses: jreleaser/release-action@v1
68-
with:
69-
arguments: assemble
70-
env:
71-
JRELEASER_PROJECT_VERSION: ${{ github.event.inputs.version }}
72-
JRELEASER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
25+
createGuide -S
7326
7427
- name: Release
75-
uses: jreleaser/release-action@v1
28+
uses: redis-field-engineering/redis-release-action@v1
7629
with:
77-
arguments: full-release
78-
env:
79-
JRELEASER_PROJECT_VERSION: ${{ github.event.inputs.version }}
80-
JRELEASER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
81-
JRELEASER_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
82-
JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }}
83-
JRELEASER_GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
84-
JRELEASER_DOCKER_DEFAULT_PASSWORD: ${{ secrets.JRELEASER_DOCKER_PASSWORD }}
85-
JRELEASER_SLACK_WEBHOOK: ${{ secrets.JRELEASER_SLACK_WEBHOOK }}
86-
87-
- name: JReleaser output
88-
if: always()
89-
uses: actions/upload-artifact@v2
30+
gpg-key-id: ${{ secrets.GPG_KEY_ID }}
31+
gpg-public-key: ${{ secrets.GPG_PUBLIC_KEY }}
32+
gpg-secret-key: ${{ secrets.GPG_SECRET_KEY }}
33+
gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }}
34+
sonatype-username: ${{ secrets.SONATYPE_USERNAME }}
35+
sonatype-password: ${{ secrets.SONATYPE_PASSWORD }}
36+
github-token: ${{ secrets.GITHUB_TOKEN }}
37+
slack-webhook: ${{ secrets.JRELEASER_SLACK_WEBHOOK }}
38+
39+
- name: Publish
40+
uses: peaceiris/actions-gh-pages@v3
9041
with:
91-
name: artifact
92-
path: |
93-
out/jreleaser/trace.log
94-
out/jreleaser/output.properties
42+
github_token: ${{ secrets.GITHUB_TOKEN }}
43+
publish_dir: ./docs/guide/build/docs/asciidoc

‎build.gradle‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ allprojects {
5353
gradlePluginPortal()
5454
mavenCentral()
5555
mavenLocal()
56+
maven { url 'https://projectlombok.org/edge-releases' }
5657
}
5758

5859
tasks.withType(GenerateModuleMetadata) {
@@ -61,12 +62,19 @@ allprojects {
6162
}
6263

6364
subprojects {
65+
6466
config {
6567
info {
6668
description = project.project_description
6769
}
6870
}
71+
6972
test {
7073
useJUnitPlatform()
7174
}
75+
76+
lombok {
77+
version = "edge-SNAPSHOT"
78+
}
79+
7280
}

‎gradle.properties‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
group=com.redis.testcontainers
22
sourceCompatibility=1.8
33
targetCompatibility=1.8
4-
redisBuildVersion=0.2.0
5-
kordampPluginVersion=0.46.0
6-
lombokPluginVersion=6.0.0-m2
4+
5+
kordampPluginVersion=0.47.0
6+
lombokPluginVersion=6.2.0
7+
kordampBuildVersion=2.6.0
8+
79
junitVersion=5.7.2
810
lettucemodVersion=1.7.3
911
slf4jVersion=1.7.32

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)