Skip to content

Commit fd9c82e

Browse files
committed
Also publish to maven central.
1 parent 6637aa1 commit fd9c82e

6 files changed

Lines changed: 42 additions & 21 deletions

.github/workflows/release.yml

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,57 @@ jobs:
1515

1616
steps:
1717
- uses: actions/checkout@v4
18-
- uses: gradle/actions/wrapper-validation@v4
18+
- uses: gradle/actions/setup-gradle@v4
19+
20+
- name: Extract Java version from branch
21+
id: java-version
22+
run: |
23+
if [ "${{ github.event_name }}" = "pull_request" ]; then
24+
BRANCH_NAME="${{ github.head_ref }}"
25+
else
26+
BRANCH_NAME="${{ github.ref_name }}"
27+
fi
28+
echo "Branch name: $BRANCH_NAME"
29+
30+
# Extract Java version from branch name (e.g., java-21, java-17, java-11)
31+
JAVA_VERSION=$(echo "$BRANCH_NAME" | grep -oE 'java-([0-9]+)' | grep -oE '[0-9]+' || true)
32+
33+
# Fallback to default if no version found in branch name
34+
if [ -z "$JAVA_VERSION" ]; then
35+
JAVA_VERSION="${{ vars.JAVA_VERSION }}"
36+
echo "No Java version found in branch name, using default: $JAVA_VERSION"
37+
else
38+
echo "Extracted Java version from branch: $JAVA_VERSION"
39+
fi
40+
echo "java-version=$JAVA_VERSION" >> $GITHUB_OUTPUT
1941
2042
- uses: oracle-actions/setup-java@v1
21-
if: ${{ vars.GRADLE_JAVA_VERSION != vars.JAVA_VERSION }}
43+
if: ${{ vars.GRADLE_JAVA_VERSION != steps.java-version.outputs.java-version }}
2244
with:
2345
website: ${{ vars.JDK_SRC }}
2446
release: ${{ vars.GRADLE_JAVA_VERSION }}
2547

2648
- run: |
2749
printf "org.gradle.java.home=%s" "$JAVA_HOME" > gradle.properties
2850
java --version
29-
if: ${{ vars.GRADLE_JAVA_VERSION != vars.JAVA_VERSION }}
51+
if: ${{ vars.GRADLE_JAVA_VERSION != steps.java-version.outputs.java-version }}
3052
3153
- uses: oracle-actions/setup-java@v1
3254
with:
3355
website: ${{ vars.JDK_SRC }}
34-
release: ${{ vars.JAVA_VERSION }}
56+
release: ${{ steps.java-version.outputs.java-version }}
3557

3658
- run: printf "org.gradle.java.home=%s" "$JAVA_HOME" > gradle.properties
37-
if: ${{ vars.GRADLE_JAVA_VERSION == vars.JAVA_VERSION }}
59+
if: ${{ vars.GRADLE_JAVA_VERSION == steps.java-version.outputs.java-version }}
3860

3961
- name: Github Packages
4062
run: |
4163
printf "\norg.gradle.java.installations.paths=%s" "$JAVA_HOME" >> gradle.properties
4264
java --version
43-
./gradlew --stacktrace --no-daemon -PjavaVersion=${{ vars.JAVA_VERSION }} -Pversion=${{ github.ref_name }} check :json-iterator:publish
65+
./gradlew --stacktrace -Psign=true -PjavaVersion=${{ steps.java-version.outputs.java-version }} -Pversion=${{ github.ref_name }} check :json-iterator:publish publishAggregationToCentralPortal
4466
env:
4567
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
68+
GPG_PUBLISH_PK: ${{ secrets.GPG_PUBLISH_PK }}
69+
GPG_PUBLISH_PF: ${{ secrets.GPG_PUBLISH_PF }}
70+
MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
71+
MAVEN_CENTRAL_SECRET: ${{ secrets.MAVEN_CENTRAL_SECRET }}

.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,3 @@
33
out/
44
build/
55
*.iml
6-
jmh_report/
7-
gen.json
8-
gradle.properties

gradle.properties

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
org.gradle.configuration-cache=true
2+
org.gradle.caching=true
3+
4+
# activate once it works more reliable in IntelliJ
5+
# https://docs.gradle.org/current/userguide/isolated_projects.html
6+
# org.gradle.unsafe.isolated-projects=true

gradle/plugins/src/main/kotlin/software.sava.gradle.base.repositories.settings.gradle.kts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
dependencyResolutionManagement {
2-
@Suppress("UnstableApiUsage")
3-
repositories {
4-
mavenCentral()
5-
}
6-
}
7-
8-
91
val gprUser =
102
providers.gradleProperty("gpr.user").orElse(providers.environmentVariable("GITHUB_ACTOR")).orElse("")
113
val gprToken =

gradle/plugins/src/main/kotlin/software.sava.gradle.feature.publish-maven-central.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ plugins {
55

66
nmcpAggregation {
77
centralPortal {
8-
username = providers.environmentVariable("MAVEN_CENTRAL_USERNAME")
9-
password = providers.environmentVariable("MAVEN_CENTRAL_PASSWORD")
8+
username = providers.environmentVariable("MAVEN_CENTRAL_TOKEN")
9+
password = providers.environmentVariable("MAVEN_CENTRAL_SECRET")
1010
publishingType = "USER_MANAGED" // "AUTOMATIC"
1111
}
1212
}

gradle/plugins/src/main/kotlin/software.sava.gradle.feature.publish.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ val gprUser =
1010
val gprToken =
1111
providers.gradleProperty("gpr.token.write").orElse(providers.environmentVariable("GITHUB_TOKEN")).orElse("")
1212
val signingKey =
13-
providers.environmentVariable("SIGNING_KEY").orNull
13+
providers.environmentVariable("GPG_PUBLISH_PK").orNull
1414
val signingPassphrase =
15-
providers.environmentVariable("SIGNING_PASSPHRASE").orNull
15+
providers.environmentVariable("GPG_PUBLISH_PF").orNull
1616
val publishSigningEnabled =
1717
providers.gradleProperty("sign").getOrElse("false").toBoolean()
1818

0 commit comments

Comments
 (0)