upgraded token settings.

robocup-logistics · Apr 22, 2024 · 909d85f · 909d85f
1 parent 5dc8031
commit 909d85f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/gradle-publish-github.yml b/.github/workflows/gradle-publish-github.yml
@@ -35,6 +35,8 @@ jobs:
       with:
         arguments: publishAllPublicationsToGitHubPackagesRepository
       env:
+        JAVA_SDK_USERNAME: ${{ env.JAVA_SDK_USERNAME }}
+        GHP_JAVA_SDK_TOKEN: ${{ secrets.GHP_JAVA_SDK_TOKEN }}
         USERNAME: ${{ github.actor }}
         TOKEN: ${{ secrets.GITHUB_TOKEN }}
         SIGNINGKEYID: ${{ secrets.SIGNINGKEYID }}

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -30,7 +30,7 @@ jobs:
         distribution: 'temurin'
     - name: Build with Gradle
       env:
-        USERNAME: ${{ env.USERNAME }}
+        JAVA_SDK_USERNAME: ${{ env.USERNAME }}
         GHP_JAVA_SDK_TOKEN: ${{ secrets.GHP_JAVA_SDK_TOKEN }}
       uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1
       with:

diff --git a/Dockerfile b/Dockerfile
@@ -1,3 +1,7 @@
+ARG JAVA_SDK_USERNAME
+ARG GHP_JAVA_SDK_TOKEN
+ENV GHP_JAVA_SDK_TOKEN $GHP_JAVA_SDK_TOKEN
+ENV JAVA_SDK_USERNAME $JAVA_SDK_USERNAME
 FROM gradle:7.6-jdk11-alpine AS build
 COPY --chown=gradle:gradle . /home/gradle/src
 WORKDIR /home/gradle/src

diff --git a/app/build.gradle b/app/build.gradle
@@ -26,7 +26,7 @@ repositories {
     maven {
         url = uri("https://maven.pkg.github.com/robocup-logistics/rcll-java")
         credentials {
-            username = project.findProperty("gprUser") != "" ? project.findProperty("gprUser") : System.getenv("USERNAME")
+            username = project.findProperty("gprUser") != "" ? project.findProperty("gprUser") : System.getenv("JAVA_SDK_USERNAME")
             password = project. findProperty("gprToken") != "" ? project.findProperty("gprToken"): System.getenv("GHP_JAVA_SDK_TOKEN")
         }
     }