fix publish package access.

sava-software · Aug 10, 2024 · edc422a · edc422a
1 parent 17370bc
commit edc422a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -35,6 +35,6 @@ jobs:
       - run: java --version
 
       - name: Gradle Check
-        run: ./gradlew -Pgpr.user=${{ secrets.GPR_USER }} -Pgpr.token=${{ secrets.GPR_TOKEN }} -PtargetJava=22 check --stacktrace --no-daemon
+        run: ./gradlew -Pgpr.sava.user=${{ secrets.GPR_USER }} -Pgpr.sava.token=${{ secrets.GPR_TOKEN }} -PtargetJava=22 check --stacktrace --no-daemon
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -39,6 +39,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Github Packages
-        run: ./gradlew -Pgpr.user=${{ secrets.GPR_USER }} -Pgpr.token=${{ secrets.GPR_TOKEN }} -PtargetJava=22 :anchor-programs:publish
+        run: ./gradlew -Pgpr.sava.user=${{ secrets.GPR_USER }} -Pgpr.sava.token=${{ secrets.GPR_TOKEN }} -PtargetJava=22 :anchor-programs:publish
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/build.gradle b/build.gradle
@@ -77,15 +77,15 @@ subprojects {
     maven {
       url = "https://maven.pkg.github.com/sava-software/solana-programs"
       credentials {
-        username = project.findProperty("gpr.user2") ?: System.getenv("GITHUB_ACTOR")
-        password = project.findProperty("gpr.token2") ?: System.getenv("GITHUB_TOKEN")
+        username = project.findProperty("gpr.sava.user") ?: System.getenv("GITHUB_ACTOR")
+        password = project.findProperty("gpr.sava.token") ?: System.getenv("GITHUB_TOKEN")
       }
     }
     maven {
       url = "https://maven.pkg.github.com/sava-software/anchor-src-gen"
       credentials {
-        username = project.findProperty("gpr.user2") ?: System.getenv("GITHUB_ACTOR")
-        password = project.findProperty("gpr.token2") ?: System.getenv("GITHUB_TOKEN")
+        username = project.findProperty("gpr.sava.user") ?: System.getenv("GITHUB_ACTOR")
+        password = project.findProperty("gpr.sava.token") ?: System.getenv("GITHUB_TOKEN")
       }
     }
     mavenCentral()

diff --git a/generator/src/main/java/software/sava/anchor/programs/Entrypoint.java b/generator/src/main/java/software/sava/anchor/programs/Entrypoint.java
@@ -222,7 +222,7 @@ public static void main(final String[] args) throws InterruptedException {
 
           final var builder = new StringBuilder(1_024);
           builder.append(String.format("module %s {%n", moduleName));
-          builder.append(exports.stream().sorted().collect(Collectors.joining("\n")).indent(tabLength));
+          builder.append(exports.stream().sorted(String::compareToIgnoreCase).collect(Collectors.joining("\n")).indent(tabLength));
           builder.append('}').append('\n');
           Files.writeString(moduleFilePath, builder.toString(), CREATE, TRUNCATE_EXISTING, WRITE);
         }