Skip to content

Commit

Permalink
Merge pull request #2067 from Gedochao/fix-scala-steward
Browse files Browse the repository at this point in the history
Remove the `examples` directory to fix `scala-steward` runs
  • Loading branch information
Gedochao committed May 4, 2023
2 parents e4fb571 + 802066e commit bf5103d
Show file tree
Hide file tree
Showing 35 changed files with 50 additions and 311 deletions.
84 changes: 49 additions & 35 deletions .github/workflows/ci.yml
Expand Up @@ -21,7 +21,7 @@ jobs:
with:
fetch-depth: 0
submodules: true
- uses: VirtusLab/scala-cli-setup@d37cecaf2c23ee668ec7e5da04eb6da66ae9fab6
- uses: VirtusLab/scala-cli-setup@ae54b20650cb58733b00250aafab28f841e6d870
with:
jvm: "temurin:17"
- name: Copy launcher
Expand All @@ -47,7 +47,7 @@ jobs:
with:
fetch-depth: 0
submodules: true
- uses: VirtusLab/scala-cli-setup@d37cecaf2c23ee668ec7e5da04eb6da66ae9fab6
- uses: VirtusLab/scala-cli-setup@ae54b20650cb58733b00250aafab28f841e6d870
with:
jvm: "temurin:17"
- name: JVM integration tests
Expand All @@ -63,7 +63,7 @@ jobs:
with:
fetch-depth: 0
submodules: true
- uses: VirtusLab/scala-cli-setup@d37cecaf2c23ee668ec7e5da04eb6da66ae9fab6
- uses: VirtusLab/scala-cli-setup@ae54b20650cb58733b00250aafab28f841e6d870
with:
jvm: "temurin:17"
- name: JVM integration tests
Expand All @@ -79,7 +79,7 @@ jobs:
with:
fetch-depth: 0
submodules: true
- uses: VirtusLab/scala-cli-setup@d37cecaf2c23ee668ec7e5da04eb6da66ae9fab6
- uses: VirtusLab/scala-cli-setup@ae54b20650cb58733b00250aafab28f841e6d870
with:
jvm: "temurin:17"
- name: JVM integration tests
Expand All @@ -95,7 +95,7 @@ jobs:
with:
fetch-depth: 0
submodules: true
- uses: VirtusLab/scala-cli-setup@d37cecaf2c23ee668ec7e5da04eb6da66ae9fab6
- uses: VirtusLab/scala-cli-setup@ae54b20650cb58733b00250aafab28f841e6d870
with:
jvm: "temurin:17"
- name: Generate native launcher
Expand All @@ -122,7 +122,7 @@ jobs:
with:
fetch-depth: 0
submodules: true
- uses: VirtusLab/scala-cli-setup@d37cecaf2c23ee668ec7e5da04eb6da66ae9fab6
- uses: VirtusLab/scala-cli-setup@ae54b20650cb58733b00250aafab28f841e6d870
with:
jvm: "temurin:17"
- uses: actions/download-artifact@v3
Expand All @@ -146,7 +146,7 @@ jobs:
with:
fetch-depth: 0
submodules: true
- uses: VirtusLab/scala-cli-setup@d37cecaf2c23ee668ec7e5da04eb6da66ae9fab6
- uses: VirtusLab/scala-cli-setup@ae54b20650cb58733b00250aafab28f841e6d870
with:
jvm: "temurin:17"
- uses: actions/download-artifact@v3
Expand All @@ -170,7 +170,7 @@ jobs:
with:
fetch-depth: 0
submodules: true
- uses: VirtusLab/scala-cli-setup@d37cecaf2c23ee668ec7e5da04eb6da66ae9fab6
- uses: VirtusLab/scala-cli-setup@ae54b20650cb58733b00250aafab28f841e6d870
with:
jvm: "temurin:17"
- uses: actions/download-artifact@v3
Expand All @@ -193,7 +193,7 @@ jobs:
with:
fetch-depth: 0
submodules: true
- uses: VirtusLab/scala-cli-setup@d37cecaf2c23ee668ec7e5da04eb6da66ae9fab6
- uses: VirtusLab/scala-cli-setup@ae54b20650cb58733b00250aafab28f841e6d870
with:
apps: ""
- name: Generate native launcher and generate os packages
Expand All @@ -213,7 +213,7 @@ jobs:
with:
fetch-depth: 0
submodules: true
- uses: VirtusLab/scala-cli-setup@d37cecaf2c23ee668ec7e5da04eb6da66ae9fab6
- uses: VirtusLab/scala-cli-setup@ae54b20650cb58733b00250aafab28f841e6d870
with:
jvm: "temurin:17"
- name: Generate native launcher
Expand All @@ -240,7 +240,7 @@ jobs:
with:
fetch-depth: 0
submodules: true
- uses: VirtusLab/scala-cli-setup@d37cecaf2c23ee668ec7e5da04eb6da66ae9fab6
- uses: VirtusLab/scala-cli-setup@ae54b20650cb58733b00250aafab28f841e6d870
with:
jvm: "temurin:17"
- uses: actions/download-artifact@v3
Expand All @@ -264,7 +264,7 @@ jobs:
with:
fetch-depth: 0
submodules: true
- uses: VirtusLab/scala-cli-setup@d37cecaf2c23ee668ec7e5da04eb6da66ae9fab6
- uses: VirtusLab/scala-cli-setup@ae54b20650cb58733b00250aafab28f841e6d870
with:
jvm: "temurin:17"
- uses: actions/download-artifact@v3
Expand All @@ -288,7 +288,7 @@ jobs:
with:
fetch-depth: 0
submodules: true
- uses: VirtusLab/scala-cli-setup@d37cecaf2c23ee668ec7e5da04eb6da66ae9fab6
- uses: VirtusLab/scala-cli-setup@ae54b20650cb58733b00250aafab28f841e6d870
with:
jvm: "temurin:17"
- uses: actions/download-artifact@v3
Expand Down Expand Up @@ -364,7 +364,7 @@ jobs:
with:
fetch-depth: 0
submodules: true
- uses: VirtusLab/scala-cli-setup@d37cecaf2c23ee668ec7e5da04eb6da66ae9fab6
- uses: VirtusLab/scala-cli-setup@ae54b20650cb58733b00250aafab28f841e6d870
with:
jvm: "temurin:17"
- name: Get latest coursier launcher
Expand Down Expand Up @@ -400,7 +400,7 @@ jobs:
uses: actions/setup-python@v4
with:
python-version: "3.10"
- uses: VirtusLab/scala-cli-setup@d37cecaf2c23ee668ec7e5da04eb6da66ae9fab6
- uses: VirtusLab/scala-cli-setup@ae54b20650cb58733b00250aafab28f841e6d870
with:
jvm: "temurin:17"
- name: Get latest coursier launcher
Expand Down Expand Up @@ -432,7 +432,7 @@ jobs:
uses: actions/setup-python@v4
with:
python-version: "3.10"
- uses: VirtusLab/scala-cli-setup@d37cecaf2c23ee668ec7e5da04eb6da66ae9fab6
- uses: VirtusLab/scala-cli-setup@ae54b20650cb58733b00250aafab28f841e6d870
with:
jvm: "temurin:17"
- name: Get latest coursier launcher
Expand Down Expand Up @@ -464,7 +464,7 @@ jobs:
uses: actions/setup-python@v4
with:
python-version: "3.10"
- uses: VirtusLab/scala-cli-setup@d37cecaf2c23ee668ec7e5da04eb6da66ae9fab6
- uses: VirtusLab/scala-cli-setup@ae54b20650cb58733b00250aafab28f841e6d870
with:
jvm: "temurin:17"
- name: Get latest coursier launcher
Expand All @@ -491,7 +491,7 @@ jobs:
with:
fetch-depth: 0
submodules: true
- uses: VirtusLab/scala-cli-setup@d37cecaf2c23ee668ec7e5da04eb6da66ae9fab6
- uses: VirtusLab/scala-cli-setup@ae54b20650cb58733b00250aafab28f841e6d870
with:
jvm: "temurin:17"
- name: Generate native launcher
Expand All @@ -515,7 +515,7 @@ jobs:
with:
fetch-depth: 0
submodules: true
- uses: VirtusLab/scala-cli-setup@d37cecaf2c23ee668ec7e5da04eb6da66ae9fab6
- uses: VirtusLab/scala-cli-setup@ae54b20650cb58733b00250aafab28f841e6d870
with:
jvm: "temurin:17"
- uses: actions/download-artifact@v3
Expand Down Expand Up @@ -552,7 +552,7 @@ jobs:
with:
fetch-depth: 0
submodules: true
- uses: VirtusLab/scala-cli-setup@d37cecaf2c23ee668ec7e5da04eb6da66ae9fab6
- uses: VirtusLab/scala-cli-setup@ae54b20650cb58733b00250aafab28f841e6d870
with:
jvm: "temurin:17"
- uses: actions/download-artifact@v3
Expand All @@ -576,7 +576,7 @@ jobs:
with:
fetch-depth: 0
submodules: true
- uses: VirtusLab/scala-cli-setup@d37cecaf2c23ee668ec7e5da04eb6da66ae9fab6
- uses: VirtusLab/scala-cli-setup@ae54b20650cb58733b00250aafab28f841e6d870
with:
jvm: "temurin:17"
- uses: actions/download-artifact@v3
Expand All @@ -599,7 +599,7 @@ jobs:
with:
fetch-depth: 0
submodules: true
- uses: VirtusLab/scala-cli-setup@d37cecaf2c23ee668ec7e5da04eb6da66ae9fab6
- uses: VirtusLab/scala-cli-setup@ae54b20650cb58733b00250aafab28f841e6d870
with:
jvm: "temurin:17"
- name: Generate native launcher
Expand All @@ -623,7 +623,7 @@ jobs:
with:
fetch-depth: 0
submodules: true
- uses: VirtusLab/scala-cli-setup@d37cecaf2c23ee668ec7e5da04eb6da66ae9fab6
- uses: VirtusLab/scala-cli-setup@ae54b20650cb58733b00250aafab28f841e6d870
with:
jvm: "temurin:17"
- uses: actions/download-artifact@v3
Expand Down Expand Up @@ -660,7 +660,7 @@ jobs:
with:
fetch-depth: 0
submodules: true
- uses: VirtusLab/scala-cli-setup@d37cecaf2c23ee668ec7e5da04eb6da66ae9fab6
- uses: VirtusLab/scala-cli-setup@ae54b20650cb58733b00250aafab28f841e6d870
with:
jvm: "temurin:17"
- uses: actions/download-artifact@v3
Expand All @@ -686,7 +686,7 @@ jobs:
with:
fetch-depth: 0
submodules: true
- uses: VirtusLab/scala-cli-setup@d37cecaf2c23ee668ec7e5da04eb6da66ae9fab6
- uses: VirtusLab/scala-cli-setup@ae54b20650cb58733b00250aafab28f841e6d870
with:
jvm: "temurin:17"
- uses: actions/download-artifact@v3
Expand All @@ -711,7 +711,7 @@ jobs:
with:
fetch-depth: 0
submodules: true
- uses: VirtusLab/scala-cli-setup@d37cecaf2c23ee668ec7e5da04eb6da66ae9fab6
- uses: VirtusLab/scala-cli-setup@ae54b20650cb58733b00250aafab28f841e6d870
with:
jvm: "zulu:17"
- uses: actions/setup-node@v3
Expand All @@ -730,7 +730,7 @@ jobs:
with:
fetch-depth: 0
submodules: true
- uses: VirtusLab/scala-cli-setup@d37cecaf2c23ee668ec7e5da04eb6da66ae9fab6
- uses: VirtusLab/scala-cli-setup@ae54b20650cb58733b00250aafab28f841e6d870
with:
jvm: "temurin:17"
- name: Check Scala / Scala.js versions in doc
Expand All @@ -755,7 +755,7 @@ jobs:
with:
fetch-depth: 0
submodules: true
- uses: VirtusLab/scala-cli-setup@d37cecaf2c23ee668ec7e5da04eb6da66ae9fab6
- uses: VirtusLab/scala-cli-setup@ae54b20650cb58733b00250aafab28f841e6d870
with:
jvm: "temurin:17"
apps: scalafmt:3.0.0
Expand All @@ -769,7 +769,7 @@ jobs:
with:
fetch-depth: 0
submodules: true
- uses: VirtusLab/scala-cli-setup@d37cecaf2c23ee668ec7e5da04eb6da66ae9fab6
- uses: VirtusLab/scala-cli-setup@ae54b20650cb58733b00250aafab28f841e6d870
with:
jvm: "temurin:17"
- name: Check that reference doc is up-to-date
Expand All @@ -789,7 +789,7 @@ jobs:
with:
fetch-depth: 0
submodules: true
- uses: VirtusLab/scala-cli-setup@d37cecaf2c23ee668ec7e5da04eb6da66ae9fab6
- uses: VirtusLab/scala-cli-setup@ae54b20650cb58733b00250aafab28f841e6d870
with:
jvm: "temurin:17"
- name: Java Version
Expand All @@ -803,6 +803,20 @@ jobs:
- name: Run Benchmark
run: ./gc $(realpath ./build/scala-cli)

test-hypothetical-sbt-export:
timeout-minutes: 120
runs-on: "ubuntu-20.04"
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
submodules: true
- uses: VirtusLab/scala-cli-setup@ae54b20650cb58733b00250aafab28f841e6d870
with:
jvm: "temurin:17"
- name: Try to export to SBT
run: scala-cli --power export --sbt .

vc-redist:
timeout-minutes: 15
runs-on: windows-latest
Expand All @@ -812,7 +826,7 @@ jobs:
with:
fetch-depth: 0
submodules: true
- uses: VirtusLab/scala-cli-setup@d37cecaf2c23ee668ec7e5da04eb6da66ae9fab6
- uses: VirtusLab/scala-cli-setup@ae54b20650cb58733b00250aafab28f841e6d870
with:
jvm: "temurin:17"
- run: ./mill -i ci.copyVcRedist
Expand All @@ -833,7 +847,7 @@ jobs:
fetch-depth: 0
submodules: true
ssh-key: ${{ secrets.SSH_PRIVATE_KEY_SCALA_CLI }}
- uses: VirtusLab/scala-cli-setup@d37cecaf2c23ee668ec7e5da04eb6da66ae9fab6
- uses: VirtusLab/scala-cli-setup@ae54b20650cb58733b00250aafab28f841e6d870
with:
jvm: "temurin:17"
- name: GPG setup
Expand Down Expand Up @@ -895,7 +909,7 @@ jobs:
with:
fetch-depth: 0
submodules: true
- uses: VirtusLab/scala-cli-setup@d37cecaf2c23ee668ec7e5da04eb6da66ae9fab6
- uses: VirtusLab/scala-cli-setup@ae54b20650cb58733b00250aafab28f841e6d870
with:
jvm: "temurin:17"
- run: ./mill -i ci.setShouldPublish
Expand Down Expand Up @@ -954,7 +968,7 @@ jobs:
with:
fetch-depth: 0
submodules: true
- uses: VirtusLab/scala-cli-setup@d37cecaf2c23ee668ec7e5da04eb6da66ae9fab6
- uses: VirtusLab/scala-cli-setup@ae54b20650cb58733b00250aafab28f841e6d870
with:
jvm: "temurin:17"
- uses: actions/download-artifact@v3
Expand Down Expand Up @@ -1037,7 +1051,7 @@ jobs:
with:
fetch-depth: 0
submodules: true
- uses: VirtusLab/scala-cli-setup@d37cecaf2c23ee668ec7e5da04eb6da66ae9fab6
- uses: VirtusLab/scala-cli-setup@ae54b20650cb58733b00250aafab28f841e6d870
with:
jvm: "temurin:17"
- uses: actions/download-artifact@v3
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -6,3 +6,4 @@ out/

.bsp
.scala-build
dest/
2 changes: 0 additions & 2 deletions examples/.gitignore

This file was deleted.

1 change: 0 additions & 1 deletion examples/cross-build/.opts

This file was deleted.

11 changes: 0 additions & 11 deletions examples/cross-build/Hello.js.scala

This file was deleted.

14 changes: 0 additions & 14 deletions examples/cross-build/Hello.native.scala

This file was deleted.

0 comments on commit bf5103d

Please sign in to comment.