feat(core): add upload to github

Vacxe · Jul 23, 2024 · 8c67411 · 8c67411
1 parent 26554d6
commit 8c67411
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 13 deletions.
diff --git a/.github/workflows/release-deploy.yml b/.github/workflows/release-deploy.yml
@@ -2,7 +2,7 @@ name: Deploy Release to Sonatype
 on:
   workflow_dispatch :
 jobs:
-  deploy:
+  deploy-ossrh:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -13,10 +13,10 @@ jobs:
           java-version: 8
           cache: gradle
       - uses: little-core-labs/get-git-tag@v3.0.2
-      - name: deploy-release
+      - name: Deploy to OSSRH
         run: ./gradlew :publishMavenPublicationToOSSRHRepository -PreleaseMode=RELEASE --stacktrace
         env:
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
           GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+          GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
diff --git a/.github/workflows/snapshot-deploy.yml b/.github/workflows/snapshot-deploy.yml
@@ -4,7 +4,7 @@ on:
     branches:
       - master
 jobs:
-  deploy:
+  deploy-ossrh:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -16,9 +16,27 @@ jobs:
           cache: gradle
       - uses: little-core-labs/get-git-tag@v3.0.2
       - name: deploy-release
-        run: ./gradlew :publishMavenPublicationToOSSRHRepository --stacktrace
+        run: ./gradlew :publishMavenPublicationToOSSRHRepository -PreleaseMode=SNAPSHOT --stacktrace
         env:
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
           GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+          GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
+
+  deploy-github:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 8
+        uses: actions/setup-java@v3
+        with:
+          distribution: "temurin"
+          java-version: 8
+          cache: gradle
+      - uses: little-core-labs/get-git-tag@v3.0.2
+      - name: deploy-release
+        run: ./gradlew :publishMavenPublicationToGithubRepository -PreleaseMode=SNAPSHOT --stacktrace
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+          GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
diff --git a/build-logic/gradle/wrapper/gradle-wrapper.properties b/build-logic/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/build-logic/publishing/build.gradle.kts b/build-logic/publishing/build.gradle.kts
@@ -7,5 +7,5 @@ repositories {
 }
 
 dependencies {
-    implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
+    implementation("com.github.johnrengelman:shadow:8.1.1")
 }
diff --git a/build-logic/publishing/src/main/kotlin/convention.publishing.gradle.kts b/build-logic/publishing/src/main/kotlin/convention.publishing.gradle.kts
@@ -19,7 +19,8 @@ tasks.withType<ShadowJar>().configureEach {
 val releaseMode: String? by project
 val versionSuffix = when (releaseMode) {
     "RELEASE" -> ""
-    else -> "-SNAPSHOT"
+    "SNAPSHOT" -> "-SNAPSHOT"
+    else -> throw Exception("Unknown release mode")
 }
 
 version = readVersion() + versionSuffix
@@ -32,6 +33,7 @@ publishing {
     publications {
         create<MavenPublication>("maven") {
             artifactId = "konveyor"
+            groupId = "io.github.vacxe"
 
             from(components["java"])
 
@@ -65,7 +67,7 @@ publishing {
                     username = System.getenv("SONATYPE_USERNAME")
                     password = System.getenv("SONATYPE_PASSWORD")
                 }
-                name = "Sonatype"
+                name = "OSSRH"
 
                 setUrl(when (releaseMode) {
                     "RELEASE" -> System.getenv("SONATYPE_RELEASES_URL")
@@ -77,7 +79,7 @@ publishing {
             }
 
             maven {
-                name = "GitHubPackages"
+                name = "Github"
                 setUrl("https://maven.pkg.github.com/vacxe/konveyor")
                 credentials {
                     username = System.getenv("GITHUB_ACTOR")

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,8 +3,6 @@ plugins {
     id("convention.publishing")
 }
 
-group = "io.github.vacxe"
-
 repositories {
     mavenCentral()
 }