Skip to content

Commit 16b7acb

Browse files
adpi2adpi2
authored
Merge pull request #14 from scala/add-toolkit-test
Add toolkit-test
2 parents 39d5ea7 + 197f84b commit 16b7acb

File tree

5 files changed

+28
-14
lines changed

5 files changed

+28
-14
lines changed

‎.github/workflows/deploy.yaml

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ on:
44
release:
55
types: [published]
66

7+
env:
8+
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
9+
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
10+
PGP_PASSWORD: ${{ secrets.PGP_PASSPHRASE }}
11+
712
jobs:
813
publish:
914
name: Release toolkit and publish
@@ -30,25 +35,34 @@ jobs:
3035
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
3136
continue-on-error: true
3237
env:
33-
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
34-
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
35-
PGP_PASSWORD: ${{ secrets.PGP_PASSPHRASE }}
3638
PGP_KEY_ID: ${{ steps.import_gpg.outputs.fingerprint }}
3739

3840
- name: Publish Toolkit for native
3941
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
4042
continue-on-error: true
4143
env:
42-
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
43-
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
44-
PGP_PASSWORD: ${{ secrets.PGP_PASSPHRASE }}
4544
PGP_KEY_ID: ${{ steps.import_gpg.outputs.fingerprint }}
4645

4746
- name: Publish Toolkit for JS
4847
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
4948
continue-on-error: true
5049
env:
51-
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
52-
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
53-
PGP_PASSWORD: ${{ secrets.PGP_PASSPHRASE }}
50+
PGP_KEY_ID: ${{ steps.import_gpg.outputs.fingerprint }}
51+
52+
- name: Publish Toolkit Test for JVM
53+
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
54+
continue-on-error: true
55+
env:
56+
PGP_KEY_ID: ${{ steps.import_gpg.outputs.fingerprint }}
57+
58+
- name: Publish Toolkit Test for native
59+
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
60+
continue-on-error: true
61+
env:
62+
PGP_KEY_ID: ${{ steps.import_gpg.outputs.fingerprint }}
63+
64+
- name: Publish Toolkit Test for JS
65+
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
66+
continue-on-error: true
67+
env:
5468
PGP_KEY_ID: ${{ steps.import_gpg.outputs.fingerprint }}

‎Toolkit.js.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
//> using scala "2.13", "2.12", "3"
2-
2+
//> using publish.name "toolkit"
33
//> using lib "com.softwaremill.sttp.client4::core::4.0.0-M1"
44
//> using lib "com.softwaremill.sttp.client4::upickle::4.0.0-M1"
55
//> using lib "com.lihaoyi::upickle::3.0.0"
6-
//> using lib "org.scalameta::munit::1.0.0-M7"

‎Toolkit.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
//> using scala "2.13", "2.12", "3"
2-
2+
//> using publish.name "toolkit"
33
//> using lib "com.softwaremill.sttp.client4::core::4.0.0-M1"
44
//> using lib "com.softwaremill.sttp.client4::upickle::4.0.0-M1"
55
//> using lib "com.lihaoyi::upickle::3.0.0"
66
//> using lib "com.lihaoyi::os-lib::0.9.1"
7-
//> using lib "org.scalameta::munit::1.0.0-M7"

‎ToolkitTest.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
//> using scala "2.13", "2.12", "3"
2+
//> using publish.name "toolkit-test"
3+
//> using lib "org.scalameta::munit::1.0.0-M7"

‎publish-conf.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
//> using publish.organization "org.scala-lang"
2-
//> using publish.name "toolkit"
32
//> using publish.computeVersion "git:tag"
43
//> using publish.url "https://github.com/scala/toolkit"
54
//> using publish.versionControl "scm:git:github.com/scala/toolkit.git"

0 commit comments

Comments
 (0)