Skip to content

Commit 39290c3

Browse files
authored
fix(ci,java): fix Java signing and publishing process (#2331)
1 parent 8252a0d commit 39290c3

File tree

4 files changed

+29
-17
lines changed

4 files changed

+29
-17
lines changed

.github/actions/java-gradle/post-merge/action.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,15 @@ runs:
6969
env:
7070
NEXUS_USER: ${{ env.NEXUS_USER }}
7171
NEXUS_PW: ${{ env.NEXUS_PW }}
72+
ORG_GRADLE_PROJECT_signingKey: ${{ env.JAVA_GPG_SIGNING_KEY }}
73+
ORG_GRADLE_PROJECT_signingPassword: ${{ env.JAVA_GPG_PASSWORD }}
7274
run: |
7375
if [ "${{ inputs.dry_run }}" = "true" ]; then
7476
echo "🔍 Dry run - would publish to Maven Nexus:"
7577
echo ""
7678
7779
# Extract version from build.gradle.kts
78-
gradle_version=$(foreign/java/gradlew -p foreign/java properties -q | grep "version:" | cut -d: -f2 | tr -d ' ')
80+
gradle_version=$(foreign/java/gradlew -p foreign/java/java-sdk properties -q | grep "version:" | cut -d: -f2 | tr -d ' ')
7981
echo "Version from gradle: $gradle_version"
8082
echo "Input version: ${{ inputs.version }}"
8183
@@ -109,7 +111,7 @@ runs:
109111
echo ""
110112
111113
# Run the publish task
112-
foreign/java/dev-support/checks/build.sh build -x test -x checkstyleMain -x checkstyleTest publish
114+
foreign/java/dev-support/checks/build.sh build -x test -x checkstyleMain -x checkstyleTest sign publish
113115
PUBLISH_EXIT_CODE=$?
114116
115117
if [ $PUBLISH_EXIT_CODE -eq 0 ]; then

.github/actions/java-gradle/pre-merge/action.yml

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,19 @@ runs:
8787
run: |
8888
foreign/java/dev-support/checks/build.sh test
8989
90-
# Copy test reports
91-
if [ -d "foreign/java/build/test-results" ]; then
92-
mkdir -p reports
93-
cp -r foreign/java/build/test-results reports/java-tests
90+
- name: Copy test reports
91+
if: ${{ !cancelled() && inputs.task == 'test' }}
92+
shell: bash
93+
run: |
94+
if [ -d "foreign/java/java-sdk/build/test-results" ]; then
95+
echo "Found test reports in java-sdk"
96+
mkdir -p reports/java-tests
97+
cp -r foreign/java/java-sdk/build/test-results reports/java-tests/sdk
9498
fi
95-
96-
# Generate test report if jacoco is configured
97-
if grep -q "jacoco" foreign/java/build.gradle 2>/dev/null; then
98-
cd foreign/java
99-
./gradlew jacocoTestReport --no-daemon
99+
if [ -d "foreign/java/external-processors/iggy-connector-flink/iggy-connector-library/build/test-results" ]; then
100+
echo "Found test reports in flink"
101+
mkdir -p reports/java-tests
102+
cp -r foreign/java/external-processors/iggy-connector-flink/iggy-connector-library/build/test-results reports/java-tests/flink
100103
fi
101104
102105
- name: Stop Iggy server
@@ -105,3 +108,11 @@ runs:
105108
with:
106109
pid-file: ${{ steps.iggy.outputs.pid_file }}
107110
log-file: ${{ steps.iggy.outputs.log_file }}
111+
112+
- name: Test Summary
113+
uses: test-summary/action@v2
114+
with:
115+
paths: |
116+
foreign/java/java-sdk/build/test-results/**/TEST-*.xml
117+
foreign/java/external-processors/iggy-connector-flink/iggy-connector-library/build/test-results/**/TEST-*.xml
118+
if: ${{ !cancelled() && inputs.task == 'test' }}

.github/workflows/publish.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -625,6 +625,8 @@ jobs:
625625
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
626626
NEXUS_USER: ${{ secrets.NEXUS_USER }}
627627
NEXUS_PW: ${{ secrets.NEXUS_PW }}
628+
JAVA_GPG_SIGNING_KEY: ${{ secrets.JAVA_GPG_SIGNING_KEY }}
629+
JAVA_GPG_PASSWORD: ${{ secrets.JAVA_GPG_PASSWORD }}
628630
NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
629631
DRY_RUN: ${{ inputs.dry_run }}
630632
outputs:

foreign/java/java-sdk/build.gradle.kts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ plugins {
2121
id("java-library")
2222
id("maven-publish")
2323
id("signing")
24-
id("org.jreleaser") version ("1.14.0")
2524
id("checkstyle")
2625
}
2726

@@ -42,7 +41,9 @@ java {
4241
}
4342

4443
signing {
45-
useGpgCmd()
44+
val signingKey: String? by project
45+
val signingPassword: String? by project
46+
useInMemoryPgpKeys(signingKey, signingPassword)
4647
sign(publishing.publications)
4748
}
4849

@@ -76,10 +77,6 @@ tasks.withType<Test> {
7677
publishing {
7778
publications {
7879
create<MavenPublication>("maven") {
79-
groupId = "org.apache.iggy"
80-
artifactId = "iggy"
81-
version = "0.6.0-SNAPSHOT"
82-
8380
from(components["java"])
8481

8582
pom {

0 commit comments

Comments
 (0)