Take from env or input, not cli

bowbahdoe · May 30, 2022 · 936869b · 936869b
1 parent 24b8301
commit 936869b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 15 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -19,8 +19,8 @@ jobs:
           gpg --list-secret-keys --keyid-format LONG
       - name: Publish package
         env:
-          OSSRH_USERNAME:
-          MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
-          MAVEN_OPTS: "--add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.desktop/java.awt.font=ALL-UNNAMED"
+          OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+          OSSRH_GPG_SECRET_KEY_PASSWORD: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
         run: |
-          java build/Build.java publish ${{ secrets.OSSRH_USERNAME }} ${{ secrets.OSSRH_PASSWORD }} ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
+          java build/Build.java publish
diff --git a/build/Build.java b/build/Build.java
@@ -239,21 +239,28 @@ public static void main(String[] args) throws Exception {
                     jar();
                 }
                 case "publish" -> {
-                    if (args.length <= 1) {
-                        var scanner = new Scanner(System.in);
+                    var scanner = new Scanner(System.in);
+
+                    String username = System.getenv("OSSRH_USERNAME");
+                    if (username == null) {
                         System.out.print("Sonatype Username: ");
-                        var username = scanner.next();
+                        username = scanner.next();
+                    }
+
+                    String password = System.getenv("OSSRH_PASSWORD");
+                    if (password == null) {
                         System.out.print("Sonatype Password: ");
-                        var password = scanner.next();
-                        System.out.print("GPG key: ");
-                        var gpgSecret = scanner.next();
-                        clean();
-                        publish(username, password, gpgSecret);
+                        password = scanner.next();
                     }
-                    else {
-                        clean();
-                        publish(args[1], args[2], args.length > 3 ? args[3] : null);
+
+                    String gpgSecret = System.getenv("OSSRH_GPG_SECRET_KEY_PASSWORD");
+                    if (gpgSecret == null) {
+                        System.out.print("GPG key: ");
+                        gpgSecret = scanner.next();
                     }
+
+                    clean();
+                    publish(username, password, gpgSecret);
                 }
                 default -> {
                     System.out.println(options);