Merge pull request #184 from refinedmods/feat/GH-176/secret-inject

build: update the way secrets are injected for publishing
refinedmods · Sep 10, 2024 · f7b092e · f7b092e
2 parents 170d891 + dc7c01e
commit f7b092e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 19 deletions.
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -98,9 +98,11 @@ jobs:
       - name: Publish to Maven
         run: ./gradlew publish
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CREEPERHOST_MAVEN_USERNAME: ${{ secrets.CREEPERHOST_MAVEN_USERNAME }}
-          CREEPERHOST_MAVEN_TOKEN: ${{ secrets.CREEPERHOST_MAVEN_TOKEN }}
+          # https://docs.gradle.org/current/samples/sample_publishing_credentials.html#header
+          ORG_GRADLE_PROJECT_GitHubPackagesUsername: ${{ env.GITHUB_ACTOR }}
+          ORG_GRADLE_PROJECT_GitHubPackagesPassword: ${{ secrets.GITHUB_TOKEN }}
+          ORG_GRADLE_PROJECT_CreeperHostUsername: ${{ secrets.CREEPERHOST_MAVEN_USERNAME }}
+          ORG_GRADLE_PROJECT_CreeperHostPassword: ${{ secrets.CREEPERHOST_MAVEN_TOKEN }}
 
   publish-javadoc:
     name: Publish Javadoc

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+### Fixed
+
+-   Fixed publishing not working with the config cache.
+
 ## [0.19.0] - 2024-09-10
 
 ### Added

diff --git a/refinedarchitect-plugin/build.gradle.kts b/refinedarchitect-plugin/build.gradle.kts
@@ -38,10 +38,6 @@ publishing {
         maven {
             name = "GitHubPackages"
             url = project.uri("https://maven.pkg.github.com/" + System.getenv("GITHUB_REPOSITORY"))
-            credentials {
-                username = System.getenv("GITHUB_ACTOR")
-                password = System.getenv("GITHUB_TOKEN")
-            }
         }
     }
 }
diff --git a/refinedarchitect-plugin/src/main/kotlin/BaseExtension.kt b/refinedarchitect-plugin/src/main/kotlin/BaseExtension.kt
@@ -103,18 +103,10 @@ open class BaseExtension(private val project: Project) {
                 maven {
                     name = "GitHubPackages"
                     url = project.uri("https://maven.pkg.github.com/" + System.getenv("GITHUB_REPOSITORY"))
-                    credentials {
-                        username = System.getenv("GITHUB_ACTOR")
-                        password = System.getenv("GITHUB_TOKEN")
-                    }
                 }
                 maven {
                     name = "CreeperHost"
                     url = project.uri("https://maven.creeperhost.net/release")
-                    credentials {
-                        username = System.getenv("CREEPERHOST_MAVEN_USERNAME")
-                        password = System.getenv("CREEPERHOST_MAVEN_TOKEN")
-                    }
                 }
             }
             publications {

diff --git a/refinedarchitect-versioning/build.gradle.kts b/refinedarchitect-versioning/build.gradle.kts
@@ -46,10 +46,6 @@ publishing {
         maven {
             name = "GitHubPackages"
             url = project.uri("https://maven.pkg.github.com/" + System.getenv("GITHUB_REPOSITORY"))
-            credentials {
-                username = System.getenv("GITHUB_ACTOR")
-                password = System.getenv("GITHUB_TOKEN")
-            }
         }
     }
     publications {