From a7461c7041feb8f78d4ad2445eac739c40314441 Mon Sep 17 00:00:00 2001 From: Szymon Rodziewicz Date: Mon, 19 Jun 2023 14:56:31 +0200 Subject: [PATCH 1/2] Add toolkit dep to toolkit test --- .github/workflows/deploy.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 1071540..a5dd43b 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -50,19 +50,22 @@ jobs: 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 + run: for i in {1..5}; do scala-cli --power publish --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: 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 + run: for i in {1..5}; do scala-cli --power publish --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: 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 + run: for i in {1..5}; do scala-cli --power publish --toolkit $TOOLKIT_VERSION --cross --js --toolkit git:tag 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 }} From 4462fad8499dc09a0d91fb2e85be6beef1fb278a Mon Sep 17 00:00:00 2001 From: Simon R Date: Mon, 19 Jun 2023 15:01:09 +0200 Subject: [PATCH 2/2] Fix mistake Co-authored-by: adpi2 --- .github/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index a5dd43b..46c15ec 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -64,7 +64,7 @@ jobs: 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 --toolkit $TOOLKIT_VERSION --cross --js --toolkit git:tag 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 + run: for i in {1..5}; do scala-cli --power publish --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 }}