Skip to content

Commit ffada13

Browse files
committed
fix publishing to maven central
Forgot to publish the key to a public keyserver...
1 parent e8bd786 commit ffada13

File tree

2 files changed

+23
-24
lines changed

2 files changed

+23
-24
lines changed

.github/workflows/build.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,19 @@ jobs:
1414
gradle:
1515
runs-on: "ubuntu-latest"
1616
timeout-minutes: 30
17+
env:
18+
MAVEN_REPOSITORY: "CENTRAL"
19+
20+
ORG_GRADLE_PROJECT_SIGNING_KEY: ${{ secrets.MAVEN_CENTRAL_SIGNING_KEY }}
21+
ORG_GRADLE_PROJECT_SIGNING_KEY_ID: ${{ secret.MAVEN_CENTRAL_SIGNING_KEY_ID }}
22+
ORG_GRADLE_PROJECT_SIGNING_KEY_PASSWORD: ""
23+
24+
MAVEN_CENTRAL_PORTAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
25+
MAVEN_CENTRAL_PORTAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
26+
1727
steps:
1828
- uses: actions/checkout@v3
1929

20-
- name: Set env
21-
run: echo "MAVEN_REPOSITORY=CENTRAL" >> $GITHUB_ENV
22-
2330
- uses: actions/setup-java@v3
2431
with:
2532
distribution: zulu
@@ -53,4 +60,4 @@ jobs:
5360
if: startsWith(github.ref, 'refs/tags/v')
5461
uses: gradle/gradle-build-action@v2
5562
with:
56-
arguments: publishMavenCentralPublicationToMavenCentralRepository
63+
arguments: publishAllPublicationsToProjectLocalRepository signOSSRHPublication zipMavenCentralPortalPublication releaseMavenCentralPortalPublication

build.gradle.kts

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import java.util.*
21
import magik.github
2+
import java.util.*
33

44
plugins {
55
kotlin("jvm") version "2.2.0"
66
id("elect86.magik") version "0.3.2"
7-
`maven-publish`
7+
id("org.danilopianini.publish-on-central") version "9.0.7"
88
signing
99
// id("com.github.johnrengelman.shadow") version "8.1.1"
1010
}
@@ -15,7 +15,7 @@ enum class MavenRepository(val group: String) {
1515
;
1616
}
1717

18-
val repository = System.getenv("MAVEN_REPOSITORY")?.takeIf { !it.isBlank() }?.let { MavenRepository.valueOf(it) } ?: MavenRepository.MARY
18+
val repository = System.getenv("MAVEN_REPOSITORY")?.takeIf { it.isNotBlank() }?.let { MavenRepository.valueOf(it) } ?: MavenRepository.MARY
1919

2020

2121
repositories {
@@ -51,13 +51,11 @@ java {
5151
withSourcesJar()
5252
}
5353

54-
5554
configure<PublishingExtension> {
5655
publications {
57-
create<MavenPublication>("mavenCentral") {
56+
withType<MavenPublication> {
5857
groupId = MavenRepository.CENTRAL.group
5958
artifactId = "glm"
60-
from(components["java"])
6159
versionMapping {
6260
usage("java-api") {
6361
fromResolutionOf("runtimeClasspath")
@@ -96,23 +94,17 @@ configure<PublishingExtension> {
9694
}
9795
}
9896
}
99-
repositories {
100-
maven {
101-
name = "mavenCentral"
102-
credentials {
103-
username = project.properties["NEXUS_USERNAME"].toString()
104-
password = project.properties["NEXUS_PASSWORD"].toString()
105-
}
106-
107-
url = uri("https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/")
108-
}
109-
}
11097
}
11198

11299
signing {
113-
val rawKey = project.properties["SIGNING_KEY"]?.toString() ?: return@signing
100+
val keyId = project.properties["SIGNING_KEY_ID"]?.toString()
101+
val rawKey = project.properties["SIGNING_KEY"]?.toString()
102+
if (keyId == null || rawKey == null) {
103+
return@signing println("No signing key is set!")
104+
}
105+
114106
val key = String(Base64.getDecoder().decode(rawKey)) // \n is not working in environment variables
115107
val password = project.properties["SIGNING_KEY_PASSWORD"]?.toString() ?: ""
116-
useInMemoryPgpKeys(key, password)
117-
sign(publishing.publications["mavenCentral"])
108+
useInMemoryPgpKeys(keyId, key, password)
109+
sign(publishing.publications["OSSRH"])
118110
}

0 commit comments

Comments
 (0)