diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index cec5eb3..1071540 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -4,6 +4,11 @@ on: release: types: [published] +env: + OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} + OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + PGP_PASSWORD: ${{ secrets.PGP_PASSPHRASE }} + jobs: publish: name: Release toolkit and publish @@ -30,25 +35,34 @@ jobs: 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: - OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} - OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} - PGP_PASSWORD: ${{ secrets.PGP_PASSPHRASE }} PGP_KEY_ID: ${{ steps.import_gpg.outputs.fingerprint }} - 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: - OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} - OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} - PGP_PASSWORD: ${{ secrets.PGP_PASSPHRASE }} PGP_KEY_ID: ${{ steps.import_gpg.outputs.fingerprint }} - name: Publish Toolkit for JS 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: - OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} - OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} - PGP_PASSWORD: ${{ secrets.PGP_PASSPHRASE }} + PGP_KEY_ID: ${{ steps.import_gpg.outputs.fingerprint }} + + - name: Publish Toolkit Test for JVM + run: for i in {1..5}; do scala-cli --power publish --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: + PGP_KEY_ID: ${{ steps.import_gpg.outputs.fingerprint }} + + - name: Publish Toolkit Test for native + run: for i in {1..5}; do scala-cli --power publish --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: + PGP_KEY_ID: ${{ steps.import_gpg.outputs.fingerprint }} + + - name: Publish Toolkit Test for JS + run: for i in {1..5}; do scala-cli --power publish --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: PGP_KEY_ID: ${{ steps.import_gpg.outputs.fingerprint }} diff --git a/Toolkit.js.scala b/Toolkit.js.scala index 3ca251b..ea55990 100644 --- a/Toolkit.js.scala +++ b/Toolkit.js.scala @@ -1,6 +1,5 @@ //> using scala "2.13", "2.12", "3" - +//> using publish.name "toolkit" //> using lib "com.softwaremill.sttp.client4::core::4.0.0-M1" //> using lib "com.softwaremill.sttp.client4::upickle::4.0.0-M1" //> using lib "com.lihaoyi::upickle::3.0.0" -//> using lib "org.scalameta::munit::1.0.0-M7" diff --git a/Toolkit.scala b/Toolkit.scala index 15128d9..eb3f816 100644 --- a/Toolkit.scala +++ b/Toolkit.scala @@ -1,7 +1,6 @@ //> using scala "2.13", "2.12", "3" - +//> using publish.name "toolkit" //> using lib "com.softwaremill.sttp.client4::core::4.0.0-M1" //> using lib "com.softwaremill.sttp.client4::upickle::4.0.0-M1" //> using lib "com.lihaoyi::upickle::3.0.0" //> using lib "com.lihaoyi::os-lib::0.9.1" -//> using lib "org.scalameta::munit::1.0.0-M7" diff --git a/ToolkitTest.scala b/ToolkitTest.scala new file mode 100644 index 0000000..52e140a --- /dev/null +++ b/ToolkitTest.scala @@ -0,0 +1,3 @@ +//> using scala "2.13", "2.12", "3" +//> using publish.name "toolkit-test" +//> using lib "org.scalameta::munit::1.0.0-M7" diff --git a/publish-conf.scala b/publish-conf.scala index 8f50c06..f936911 100644 --- a/publish-conf.scala +++ b/publish-conf.scala @@ -1,5 +1,4 @@ //> using publish.organization "org.scala-lang" -//> using publish.name "toolkit" //> using publish.computeVersion "git:tag" //> using publish.url "https://github.com/scala/toolkit" //> using publish.versionControl "scm:git:github.com/scala/toolkit.git"