Further work on CI

Author: szymon-rd

.github/workflows/deploy.yaml

@@ -26,7 +26,6 @@ jobs:
       - name: Setup Scala CLI
         uses: VirtusLab/scala-cli-setup@main
 
-
       - name: Import GPG key
         id: import_gpg
         run: |
@@ -37,49 +36,42 @@ jobs:
         env:
           gpg_private_key: ${{ secrets.PGP_SECRET }}
           passphrase: ${{ secrets.PGP_PASSPHRASE }}
-
-      - name: Local publish Toolkit for JVM
-        run: for i in {1..5}; do scala-cli --power publish local --cross Toolkit.scala publish-conf.scala --gpg-key $PGP_KEY_ID --gpg-option --pinentry-mode --gpg-option loopback --gpg-option --passphrase --gpg-option $PGP_PASSWORD && break || sleep 15; done
-        continue-on-error: true
-        env:
-          PGP_KEY_ID: ${{ steps.import_gpg.outputs.fingerprint }}
 
-      - name: Local publish Toolkit for native
-        run: for i in {1..5}; do scala-cli --power publish local --cross --native Toolkit.scala publish-conf.scala --gpg-key $PGP_KEY_ID --gpg-option --pinentry-mode --gpg-option loopback --gpg-option --passphrase --gpg-option $PGP_PASSWORD && break || sleep 15; done
+     - name: Publish Toolkit for JVM
+        run: for i in {1..5}; do scala-cli --power publish --cross Toolkit.scala publish-conf.scala --password env:OSSRH_PASSWORD --user env:OSSRH_USERNAME --gpg-key $PGP_KEY_ID --gpg-option --pinentry-mode --gpg-option loopback --gpg-option --passphrase --gpg-option $PGP_PASSWORD && break || sleep 15; done
         continue-on-error: true
         env:
           PGP_KEY_ID: ${{ steps.import_gpg.outputs.fingerprint }}
 
-      - name: Local publish Toolkit for js
-        run: for i in {1..5}; do scala-cli --power publish local --cross --js Toolkit.scala publish-conf.scala --gpg-key $PGP_KEY_ID --gpg-option --pinentry-mode --gpg-option loopback --gpg-option --passphrase --gpg-option $PGP_PASSWORD && break || sleep 15; done
+      - name: Publish Toolkit for native
+        run: for i in {1..5}; do scala-cli --power publish --cross --native Toolkit.scala publish-conf.scala --password env:OSSRH_PASSWORD --user env:OSSRH_USERNAME --gpg-key $PGP_KEY_ID --gpg-option --pinentry-mode --gpg-option loopback --gpg-option --passphrase --gpg-option $PGP_PASSWORD && break || sleep 15; done
         continue-on-error: true
         env:
           PGP_KEY_ID: ${{ steps.import_gpg.outputs.fingerprint }}
 
-      - name: Publish Toolkit for JVM
-        run: scala-cli --power publish --cross Toolkit.scala publish-conf.scala 
-
-      - name: Publish Toolkit for native
-        run: scala-cli --power publish --cross --native Toolkit.scala publish-conf.scala 
-
       - name: Publish Toolkit for JS
-        run: scala-cli --power publish --cross --js Toolkit.scala publish-conf.scala 
+        run: for i in {1..5}; do scala-cli --power publish --cross --js Toolkit.js.scala publish-conf.scala --password env:OSSRH_PASSWORD --user env:OSSRH_USERNAME --gpg-key $PGP_KEY_ID --gpg-option --pinentry-mode --gpg-option loopback --gpg-option --passphrase --gpg-option $PGP_PASSWORD && break || sleep 15; done
         continue-on-error: true
+        env:
+          PGP_KEY_ID: ${{ steps.import_gpg.outputs.fingerprint }}
 
       - name: Publish Toolkit Test for JVM
-        run: scala-cli --power publish --toolkit $TOOLKIT_VERSION --cross ToolkitTest.scala publish-conf.scala 
+        run: for i in {1..5}; do scala-cli --power publish --dependency "org.scala-lang::toolkit:$TOOLKIT_VERSION" --cross ToolkitTest.scala publish-conf.scala --password env:OSSRH_PASSWORD --user env:OSSRH_USERNAME --gpg-key $PGP_KEY_ID --gpg-option --pinentry-mode --gpg-option loopback --gpg-option --passphrase --gpg-option $PGP_PASSWORD && break || sleep 15; done
         continue-on-error: true
         env:
           TOOLKIT_VERSION: ${{ github.ref_name }}
-
+          PGP_KEY_ID: ${{ steps.import_gpg.outputs.fingerprint }}
+    
       - name: Publish Toolkit Test for native
-        run: scala-cli --power publish --native --toolkit $TOOLKIT_VERSION --cross ToolkitTest.scala publish-conf.scala 
+        run: for i in {1..5}; do scala-cli --power publish --dependency "org.scala-lang::toolkit:$TOOLKIT_VERSION" --cross --native ToolkitTest.scala publish-conf.scala --password env:OSSRH_PASSWORD --user env:OSSRH_USERNAME --gpg-key $PGP_KEY_ID --gpg-option --pinentry-mode --gpg-option loopback --gpg-option --passphrase --gpg-option $PGP_PASSWORD && break || sleep 15; done
         continue-on-error: true
         env:
           TOOLKIT_VERSION: ${{ github.ref_name }}
+          PGP_KEY_ID: ${{ steps.import_gpg.outputs.fingerprint }}
 
       - name: Publish Toolkit Test for JS
-        run: scala-cli --power publish --js --toolkit $TOOLKIT_VERSION --cross ToolkitTest.scala publish-conf.scala 
+        run: for i in {1..5}; do scala-cli --power publish --dependency "org.scala-lang::toolkit:$TOOLKIT_VERSION" --cross --js ToolkitTest.scala publish-conf.scala --password env:OSSRH_PASSWORD --user env:OSSRH_USERNAME --gpg-key $PGP_KEY_ID --gpg-option --pinentry-mode --gpg-option loopback --gpg-option --passphrase --gpg-option $PGP_PASSWORD && break || sleep 15; done
         continue-on-error: true
         env:
           TOOLKIT_VERSION: ${{ github.ref_name }}
+          PGP_KEY_ID: ${{ steps.import_gpg.outputs.fingerprint }}

publish-conf.scala

@@ -6,7 +6,3 @@
 //> using publish.repository "central"
 //> using publish.developer "szymon-rd|Simon R|https://github.com/szymon-rd"
 //> using publish.developer "adpi2|Adrien Piquerez|https://github.com/adpi2"
-//> using publish.ci.user "env:OSSRH_USERNAME"
-//> using publish.ci.password "env:OSSRH_PASSWORD"
-//> using publish.ci.secretKey "env:GPG_PRIVATE_KEY"
-//> using publish.ci.secretKeyPassword "env:PGP_PASSWORD"