Skip to content

Commit 2a054ef

Browse files
authored
Merge pull request #41 from scala/tests-n-updates
Add cross platform tests and rework changelog
2 parents f83970c + 9d702d4 commit 2a054ef

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+791
-491
lines changed

.github/workflows/deploy.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,8 @@ jobs:
2626
- name: Setup Scala CLI
2727
uses: VirtusLab/scala-cli-setup@main
2828

29-
- name: Test changelog and dependency tree semver compliance
30-
run: |
31-
scala-cli checks -- --module-name toolkit --file Toolkit.scala --skip js
32-
scala-cli checks -- --module-name toolkit --file Toolkit.js.scala --skip jvm --skip native
33-
scala-cli checks -- --module-name toolkit-test --file ToolkitTest.scala --module-dep toolkit
29+
- name: Test changelog compliance
30+
run: scala-cli changelog
3431

3532
- name: Import GPG key
3633
id: import_gpg
@@ -99,4 +96,4 @@ jobs:
9996
continue-on-error: true
10097
env:
10198
TOOLKIT_VERSION: ${{ github.ref_name }}
102-
PGP_KEY_ID: ${{ steps.import_gpg.outputs.fingerprint }}
99+
PGP_KEY_ID: ${{ steps.import_gpg.outputs.fingerprint }}

.github/workflows/test.yaml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,27 @@ jobs:
2020
- name: Setup Scala CLI
2121
uses: VirtusLab/scala-cli-setup@main
2222

23-
- name: Test changelog and dependency tree semver compliance
24-
run: |
25-
scala-cli checks -- --module-name toolkit --file Toolkit.scala --skip js
26-
scala-cli checks -- --module-name toolkit --file Toolkit.js.scala --skip jvm --skip native
27-
scala-cli checks -- --module-name toolkit-test --file ToolkitTest.scala --module-dep toolkit
23+
- name: Run changelog tests
24+
run: scala-cli test changelog
25+
26+
- name: Check changelog compliance
27+
run: scala-cli changelog
28+
29+
- name: Run cross-platform tests
30+
run: scala-cli test tests/CrossPlatform.test.scala
2831

29-
- name: Run test examples
32+
- name: Compile and run examples
3033
run: |
3134
cd examples
3235
for file in *.sc
3336
do
3437
scala-cli "$file"
3538
done
3639
37-
- name: Run examples of tests
40+
- name: Compile and test examples
3841
run: |
3942
cd examples
4043
for file in *.test.scala
4144
do
4245
scala-cli test "$file"
4346
done
44-
- name: Run checks tests
45-
run: scala-cli test checks
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"moduleName":"toolkit-test","directChanges":[{"$type":"DepUpdated","oldDep":{"id":"org.scala-lang:toolkit_2.13","version":{"major":0,"minor":2,"patch":1},"deps":[{"id":"com.lihaoyi:os-lib_2.13","version":{"major":0,"minor":9,"patch":1},"deps":[{"id":"com.lihaoyi:geny_2.13","version":{"major":1,"minor":0,"patch":0},"deps":[]}]},{"id":"com.lihaoyi:upickle_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:ujson_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:upickle-core_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:geny_2.13","version":{"major":1,"minor":0,"patch":0},"deps":[]}]}]},{"id":"com.lihaoyi:upack_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:upickle-core_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:geny_2.13","version":{"major":1,"minor":0,"patch":0},"deps":[]}]}]},{"id":"com.lihaoyi:upickle-implicits_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:upickle-core_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:geny_2.13","version":{"major":1,"minor":0,"patch":0},"deps":[]}]}]}]},{"id":"com.softwaremill.sttp.client4:core_2.13","version":{"major":4,"minor":0,"patch":0,"suffix":["M6"]},"deps":[{"id":"com.softwaremill.sttp.model:core_2.13","version":{"major":1,"minor":7,"patch":2},"deps":[]},{"id":"com.softwaremill.sttp.shared:core_2.13","version":{"major":1,"minor":3,"patch":16},"deps":[]},{"id":"com.softwaremill.sttp.shared:ws_2.13","version":{"major":1,"minor":3,"patch":16},"deps":[{"id":"com.softwaremill.sttp.model:core_2.13","version":{"major":1,"minor":6,"patch":0},"deps":[]},{"id":"com.softwaremill.sttp.shared:core_2.13","version":{"major":1,"minor":3,"patch":16},"deps":[]}]}]},{"id":"com.softwaremill.sttp.client4:upickle_2.13","version":{"major":4,"minor":0,"patch":0,"suffix":["M6"]},"deps":[{"id":"com.lihaoyi:upickle_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:ujson_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:upickle-core_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:geny_2.13","version":{"major":1,"minor":0,"patch":0},"deps":[]}]}]},{"id":"com.lihaoyi:upack_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:upickle-core_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:geny_2.13","version":{"major":1,"minor":0,"patch":0},"deps":[]}]}]},{"id":"com.lihaoyi:upickle-implicits_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:upickle-core_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:geny_2.13","version":{"major":1,"minor":0,"patch":0},"deps":[]}]}]}]},{"id":"com.softwaremill.sttp.client4:core_2.13","version":{"major":4,"minor":0,"patch":0,"suffix":["M6"]},"deps":[{"id":"com.softwaremill.sttp.model:core_2.13","version":{"major":1,"minor":7,"patch":2},"deps":[]},{"id":"com.softwaremill.sttp.shared:core_2.13","version":{"major":1,"minor":3,"patch":16},"deps":[]},{"id":"com.softwaremill.sttp.shared:ws_2.13","version":{"major":1,"minor":3,"patch":16},"deps":[{"id":"com.softwaremill.sttp.model:core_2.13","version":{"major":1,"minor":6,"patch":0},"deps":[]},{"id":"com.softwaremill.sttp.shared:core_2.13","version":{"major":1,"minor":3,"patch":16},"deps":[]}]}]},{"id":"com.softwaremill.sttp.client4:json-common_2.13","version":{"major":4,"minor":0,"patch":0,"suffix":["M6"]},"deps":[{"id":"com.softwaremill.sttp.client4:core_2.13","version":{"major":4,"minor":0,"patch":0,"suffix":["M6"]},"deps":[{"id":"com.softwaremill.sttp.model:core_2.13","version":{"major":1,"minor":7,"patch":2},"deps":[]},{"id":"com.softwaremill.sttp.shared:core_2.13","version":{"major":1,"minor":3,"patch":16},"deps":[]},{"id":"com.softwaremill.sttp.shared:ws_2.13","version":{"major":1,"minor":3,"patch":16},"deps":[{"id":"com.softwaremill.sttp.model:core_2.13","version":{"major":1,"minor":6,"patch":0},"deps":[]},{"id":"com.softwaremill.sttp.shared:core_2.13","version":{"major":1,"minor":3,"patch":16},"deps":[]}]}]}]}]}]},"newDep":{"id":"org.scala-lang:toolkit_2.13","version":{"major":0,"minor":2,"patch":2},"deps":[{"id":"com.lihaoyi:os-lib_2.13","version":{"major":0,"minor":9,"patch":1},"deps":[{"id":"com.lihaoyi:geny_2.13","version":{"major":1,"minor":0,"patch":0},"deps":[]}]},{"id":"com.lihaoyi:upickle_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:ujson_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:upickle-core_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:geny_2.13","version":{"major":1,"minor":0,"patch":0},"deps":[]}]}]},{"id":"com.lihaoyi:upack_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:upickle-core_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:geny_2.13","version":{"major":1,"minor":0,"patch":0},"deps":[]}]}]},{"id":"com.lihaoyi:upickle-implicits_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:upickle-core_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:geny_2.13","version":{"major":1,"minor":0,"patch":0},"deps":[]}]}]}]},{"id":"com.softwaremill.sttp.client4:core_2.13","version":{"major":4,"minor":0,"patch":0,"suffix":["M6"]},"deps":[{"id":"com.softwaremill.sttp.model:core_2.13","version":{"major":1,"minor":7,"patch":2},"deps":[]},{"id":"com.softwaremill.sttp.shared:core_2.13","version":{"major":1,"minor":3,"patch":16},"deps":[]},{"id":"com.softwaremill.sttp.shared:ws_2.13","version":{"major":1,"minor":3,"patch":16},"deps":[{"id":"com.softwaremill.sttp.model:core_2.13","version":{"major":1,"minor":6,"patch":0},"deps":[]},{"id":"com.softwaremill.sttp.shared:core_2.13","version":{"major":1,"minor":3,"patch":16},"deps":[]}]}]},{"id":"com.softwaremill.sttp.client4:upickle_2.13","version":{"major":4,"minor":0,"patch":0,"suffix":["M6"]},"deps":[{"id":"com.lihaoyi:upickle_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:ujson_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:upickle-core_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:geny_2.13","version":{"major":1,"minor":0,"patch":0},"deps":[]}]}]},{"id":"com.lihaoyi:upack_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:upickle-core_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:geny_2.13","version":{"major":1,"minor":0,"patch":0},"deps":[]}]}]},{"id":"com.lihaoyi:upickle-implicits_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:upickle-core_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:geny_2.13","version":{"major":1,"minor":0,"patch":0},"deps":[]}]}]}]},{"id":"com.softwaremill.sttp.client4:core_2.13","version":{"major":4,"minor":0,"patch":0,"suffix":["M6"]},"deps":[{"id":"com.softwaremill.sttp.model:core_2.13","version":{"major":1,"minor":7,"patch":2},"deps":[]},{"id":"com.softwaremill.sttp.shared:core_2.13","version":{"major":1,"minor":3,"patch":16},"deps":[]},{"id":"com.softwaremill.sttp.shared:ws_2.13","version":{"major":1,"minor":3,"patch":16},"deps":[{"id":"com.softwaremill.sttp.model:core_2.13","version":{"major":1,"minor":6,"patch":0},"deps":[]},{"id":"com.softwaremill.sttp.shared:core_2.13","version":{"major":1,"minor":3,"patch":16},"deps":[]}]}]},{"id":"com.softwaremill.sttp.client4:json-common_2.13","version":{"major":4,"minor":0,"patch":0,"suffix":["M6"]},"deps":[{"id":"com.softwaremill.sttp.client4:core_2.13","version":{"major":4,"minor":0,"patch":0,"suffix":["M6"]},"deps":[{"id":"com.softwaremill.sttp.model:core_2.13","version":{"major":1,"minor":7,"patch":2},"deps":[]},{"id":"com.softwaremill.sttp.shared:core_2.13","version":{"major":1,"minor":3,"patch":16},"deps":[]},{"id":"com.softwaremill.sttp.shared:ws_2.13","version":{"major":1,"minor":3,"patch":16},"deps":[{"id":"com.softwaremill.sttp.model:core_2.13","version":{"major":1,"minor":6,"patch":0},"deps":[]},{"id":"com.softwaremill.sttp.shared:core_2.13","version":{"major":1,"minor":3,"patch":16},"deps":[]}]}]}]}]}]},"under":[{"id":"org.scala-lang:toolkit-test_2.13","version":{"major":0,"minor":2,"patch":2},"deps":[{"id":"org.scala-lang:toolkit_2.13","version":{"major":0,"minor":2,"patch":2},"deps":[{"id":"com.lihaoyi:os-lib_2.13","version":{"major":0,"minor":9,"patch":1},"deps":[{"id":"com.lihaoyi:geny_2.13","version":{"major":1,"minor":0,"patch":0},"deps":[]}]},{"id":"com.lihaoyi:upickle_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:ujson_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:upickle-core_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:geny_2.13","version":{"major":1,"minor":0,"patch":0},"deps":[]}]}]},{"id":"com.lihaoyi:upack_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:upickle-core_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:geny_2.13","version":{"major":1,"minor":0,"patch":0},"deps":[]}]}]},{"id":"com.lihaoyi:upickle-implicits_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:upickle-core_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:geny_2.13","version":{"major":1,"minor":0,"patch":0},"deps":[]}]}]}]},{"id":"com.softwaremill.sttp.client4:core_2.13","version":{"major":4,"minor":0,"patch":0,"suffix":["M6"]},"deps":[{"id":"com.softwaremill.sttp.model:core_2.13","version":{"major":1,"minor":7,"patch":2},"deps":[]},{"id":"com.softwaremill.sttp.shared:core_2.13","version":{"major":1,"minor":3,"patch":16},"deps":[]},{"id":"com.softwaremill.sttp.shared:ws_2.13","version":{"major":1,"minor":3,"patch":16},"deps":[{"id":"com.softwaremill.sttp.model:core_2.13","version":{"major":1,"minor":6,"patch":0},"deps":[]},{"id":"com.softwaremill.sttp.shared:core_2.13","version":{"major":1,"minor":3,"patch":16},"deps":[]}]}]},{"id":"com.softwaremill.sttp.client4:upickle_2.13","version":{"major":4,"minor":0,"patch":0,"suffix":["M6"]},"deps":[{"id":"com.lihaoyi:upickle_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:ujson_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:upickle-core_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:geny_2.13","version":{"major":1,"minor":0,"patch":0},"deps":[]}]}]},{"id":"com.lihaoyi:upack_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:upickle-core_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:geny_2.13","version":{"major":1,"minor":0,"patch":0},"deps":[]}]}]},{"id":"com.lihaoyi:upickle-implicits_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:upickle-core_2.13","version":{"major":3,"minor":1,"patch":3},"deps":[{"id":"com.lihaoyi:geny_2.13","version":{"major":1,"minor":0,"patch":0},"deps":[]}]}]}]},{"id":"com.softwaremill.sttp.client4:core_2.13","version":{"major":4,"minor":0,"patch":0,"suffix":["M6"]},"deps":[{"id":"com.softwaremill.sttp.model:core_2.13","version":{"major":1,"minor":7,"patch":2},"deps":[]},{"id":"com.softwaremill.sttp.shared:core_2.13","version":{"major":1,"minor":3,"patch":16},"deps":[]},{"id":"com.softwaremill.sttp.shared:ws_2.13","version":{"major":1,"minor":3,"patch":16},"deps":[{"id":"com.softwaremill.sttp.model:core_2.13","version":{"major":1,"minor":6,"patch":0},"deps":[]},{"id":"com.softwaremill.sttp.shared:core_2.13","version":{"major":1,"minor":3,"patch":16},"deps":[]}]}]},{"id":"com.softwaremill.sttp.client4:json-common_2.13","version":{"major":4,"minor":0,"patch":0,"suffix":["M6"]},"deps":[{"id":"com.softwaremill.sttp.client4:core_2.13","version":{"major":4,"minor":0,"patch":0,"suffix":["M6"]},"deps":[{"id":"com.softwaremill.sttp.model:core_2.13","version":{"major":1,"minor":7,"patch":2},"deps":[]},{"id":"com.softwaremill.sttp.shared:core_2.13","version":{"major":1,"minor":3,"patch":16},"deps":[]},{"id":"com.softwaremill.sttp.shared:ws_2.13","version":{"major":1,"minor":3,"patch":16},"deps":[{"id":"com.softwaremill.sttp.model:core_2.13","version":{"major":1,"minor":6,"patch":0},"deps":[]},{"id":"com.softwaremill.sttp.shared:core_2.13","version":{"major":1,"minor":3,"patch":16},"deps":[]}]}]}]}]}]},{"id":"org.scalameta:munit_2.13","version":{"major":1,"minor":0,"patch":0,"suffix":["M10"]},"deps":[{"id":"junit:junit","version":{"major":4,"minor":13,"patch":2},"deps":[{"id":"org.hamcrest:hamcrest-core","version":{"major":1,"minor":3,"patch":0},"deps":[]}]},{"id":"org.scalameta:junit-interface","version":{"major":1,"minor":0,"patch":0,"suffix":["M10"]},"deps":[{"id":"junit:junit","version":{"major":4,"minor":13,"patch":2},"deps":[{"id":"org.hamcrest:hamcrest-core","version":{"major":1,"minor":3,"patch":0},"deps":[]}]},{"id":"org.scala-sbt:test-interface","version":{"major":1,"minor":0,"patch":0},"deps":[]}]}]}]}]}],"indirectChanges":[]}

0 commit comments

Comments
 (0)