[ci] Fix group ids not being respected

CompactMods · Jan 2, 2022 · dc8d259 · dc8d259
1 parent 38e3e46
commit dc8d259
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/ci-tests-nightly.yml b/.github/workflows/ci-tests-nightly.yml
@@ -94,7 +94,7 @@ jobs:
         run: chmod +x gradlew
 
       - name: Publish gradle nightly jar
-        run: ./gradlew publishNightlyMavenPublicationToGitHubPackagesRepository
+        run: ./gradlew publishNightlyPublicationToGitHubPackagesRepository
         env:
           CM_RELEASE: false
           GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }}

diff --git a/.github/workflows/manual-gh-packages.yml b/.github/workflows/manual-gh-packages.yml
@@ -118,7 +118,7 @@ jobs:
         run: chmod +x gradlew
 
       - name: Publish JAR with Gradle
-        run: ./gradlew publish -x test
+        run: ./gradlew publishReleasePublicationToGitHubPackagesRepository -x test
         env:
           CM_RELEASE: true
           GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }}

diff --git a/.github/workflows/tagged-release.yml b/.github/workflows/tagged-release.yml
@@ -120,7 +120,7 @@ jobs:
         run: chmod +x gradlew
 
       - name: Publish package
-        run: ./gradlew publishMavenPublicationToGitHubPackagesRepository -x test
+        run: ./gradlew publishReleasePublicationToGitHubPackagesRepository -x test
         env:
           CM_RELEASE: true
           GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }}

diff --git a/build.gradle b/build.gradle
@@ -209,7 +209,7 @@ jar {
                 "Specification-Vendor"    : "",
                 "Specification-Version"   : "1", // We are version 1 of ourselves
                 "Implementation-Title"    : project.name,
-                "Implementation-Version"  : version,
+                "Implementation-Version"  : archiveVersion,
                 "Implementation-Vendor"   : "",
                 "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
         ])
@@ -229,10 +229,10 @@ artifacts {
 
 publishing {
     publications {
-        maven(MavenPublication) {
+        release(MavenPublication) {
             artifactId = mod_id
-            group = "dev.compactmods"
-            
+            groupId = "dev.compactmods"
+
             artifacts {
                 artifact jar
                 artifact(apiJar) {
@@ -241,9 +241,10 @@ publishing {
             }
         }
 
-        nightlyMaven(MavenPublication) {
+        nightly(MavenPublication) {
             artifactId = mod_id
-            group = "dev.compactmods.nightly"
+            groupId = "dev.compactmods.nightly"
+            version = "${mod_version}+nightly-${gitCommitHash}"
 
             artifacts {
                 artifact(jar)