Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add toolkit-test #14

Merged
merged 3 commits into from
Apr 26, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,30 @@ jobs:
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:
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 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:
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
PGP_PASSWORD: ${{ secrets.PGP_PASSPHRASE }}
PGP_KEY_ID: ${{ steps.import_gpg.outputs.fingerprint }}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we move those envs to the job level, to avoid repeating them so many times?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea! I moved all but the PGP_KEY_ID, because this one comes from a previous step.


- 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:
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
PGP_PASSWORD: ${{ secrets.PGP_PASSPHRASE }}
PGP_KEY_ID: ${{ steps.import_gpg.outputs.fingerprint }}
3 changes: 1 addition & 2 deletions Toolkit.js.scala
Original file line number Diff line number Diff line change
@@ -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"
3 changes: 1 addition & 2 deletions Toolkit.scala
Original file line number Diff line number Diff line change
@@ -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"
3 changes: 3 additions & 0 deletions ToolkitTest.scala
Original file line number Diff line number Diff line change
@@ -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"
1 change: 0 additions & 1 deletion publish-conf.scala
Original file line number Diff line number Diff line change
@@ -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"
Expand Down