-
Notifications
You must be signed in to change notification settings - Fork 241
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into scalapy-rich-print-rebased
Conflicts: .github/workflows/ci.yml build.sc
- Loading branch information
Showing
33 changed files
with
1,477 additions
and
602 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -20,20 +20,20 @@ jobs: | |
run: | | ||
git config --global core.autocrlf false | ||
git config --global core.eol lf | ||
- uses: actions/checkout@v2 | ||
- uses: actions/checkout@v3 | ||
with: | ||
fetch-depth: 0 | ||
submodules: true | ||
- name: Set up Python | ||
uses: actions/setup-python@v2 | ||
uses: actions/setup-python@v4 | ||
with: | ||
python-version: 3.7 | ||
python-version: "3.10" | ||
- name: Install python dependencies | ||
run: | | ||
python -m pip install --upgrade pip | ||
pip install -r examples/requirements.txt --no-dependencies | ||
- uses: coursier/[email protected] | ||
- uses: coursier/setup-action@v1 | ||
- uses: coursier/setup-action@v1.2.1 | ||
with: | ||
jvm: 8 | ||
- run: ./mill -i validateExamples | ||
|
@@ -46,26 +46,26 @@ jobs: | |
matrix: | ||
OS: [ubuntu-latest] | ||
JDK: [8] | ||
SCALA: [2.12.13, 2.12.14, 2.13.5, 2.13.6, 3.0.0, 3.0.1] | ||
SCALA: [2.12.15, 2.12.16, 2.13.7, 2.13.8, 3.1.2, 3.1.3] | ||
include: | ||
- OS: windows-latest | ||
JDK: 8 | ||
SCALA: 2.13.6 | ||
SCALA: 2.13.8 | ||
- OS: ubuntu-latest | ||
JDK: 11 | ||
SCALA: 2.12.14 | ||
SCALA: 2.12.16 | ||
steps: | ||
- name: Don't convert LF to CRLF during checkout | ||
if: runner.os == 'Windows' | ||
run: | | ||
git config --global core.autocrlf false | ||
git config --global core.eol lf | ||
- uses: actions/checkout@v2 | ||
- uses: actions/checkout@v3 | ||
with: | ||
fetch-depth: 0 | ||
submodules: true | ||
- uses: coursier/[email protected] | ||
- uses: coursier/setup-action@v1 | ||
- uses: coursier/setup-action@v1.2.1 | ||
with: | ||
jvm: ${{ matrix.JDK }} | ||
apps: | ||
|
@@ -82,12 +82,12 @@ jobs: | |
run: | | ||
git config --global core.autocrlf false | ||
git config --global core.eol lf | ||
- uses: actions/checkout@v2 | ||
- uses: actions/checkout@v3 | ||
with: | ||
fetch-depth: 0 | ||
submodules: true | ||
- uses: coursier/[email protected] | ||
- uses: coursier/setup-action@v1 | ||
- uses: coursier/setup-action@v1.2.1 | ||
with: | ||
jvm: 8 | ||
- run: ./mill __.mimaReportBinaryIssues | ||
|
@@ -96,12 +96,12 @@ jobs: | |
website: | ||
runs-on: ubuntu-latest | ||
steps: | ||
- uses: actions/checkout@v2 | ||
- uses: actions/checkout@v3 | ||
with: | ||
fetch-depth: 0 | ||
submodules: true | ||
- uses: coursier/[email protected] | ||
- uses: coursier/setup-action@v1 | ||
- uses: coursier/setup-action@v1.2.1 | ||
with: | ||
jvm: 8 | ||
apps: cs | ||
|
@@ -111,12 +111,12 @@ jobs: | |
publishLocal: | ||
runs-on: ubuntu-latest | ||
steps: | ||
- uses: actions/checkout@v2 | ||
- uses: actions/checkout@v3 | ||
with: | ||
fetch-depth: 0 | ||
submodules: true | ||
- uses: coursier/[email protected] | ||
- uses: coursier/setup-action@v1 | ||
- uses: coursier/setup-action@v1.2.1 | ||
with: | ||
jvm: 8 | ||
apps: | ||
|
@@ -137,12 +137,12 @@ jobs: | |
if: github.event_name == 'push' | ||
runs-on: ubuntu-latest | ||
steps: | ||
- uses: actions/checkout@v2 | ||
- uses: actions/checkout@v3 | ||
with: | ||
fetch-depth: 0 | ||
submodules: true | ||
- uses: coursier/[email protected] | ||
- uses: coursier/setup-action@v1 | ||
- uses: coursier/setup-action@v1.2.1 | ||
with: | ||
jvm: 8 | ||
- run: echo "$PGP_SECRET" | base64 --decode | gpg --batch --import | ||
|
@@ -160,28 +160,30 @@ jobs: | |
needs: release | ||
runs-on: ubuntu-latest | ||
steps: | ||
- uses: actions/checkout@v2 | ||
- uses: actions/checkout@v3 | ||
with: | ||
fetch-depth: 0 | ||
submodules: true | ||
- uses: coursier/[email protected] | ||
- uses: coursier/setup-action@v1 | ||
- uses: coursier/setup-action@v1.2.1 | ||
with: | ||
jvm: 8 | ||
- run: scripts/upload-launcher.sh | ||
- run: ./mill -i ci.uploadLaunchers | ||
if: startsWith(github.ref, 'refs/tags/v') | ||
shell: bash | ||
env: | ||
UPLOAD_GH_TOKEN: ${{ secrets.GH_TOKEN }} | ||
|
||
update-docker-images: | ||
needs: release | ||
runs-on: ubuntu-latest | ||
steps: | ||
- uses: actions/checkout@v2 | ||
- uses: actions/checkout@v3 | ||
with: | ||
fetch-depth: 0 | ||
submodules: true | ||
- uses: coursier/[email protected] | ||
- uses: coursier/setup-action@v1 | ||
- uses: coursier/setup-action@v1.2.1 | ||
with: | ||
jvm: 8 | ||
- run: scripts/update-docker-images.sh | ||
|
@@ -194,28 +196,28 @@ jobs: | |
needs: [upload-launcher, update-docker-images] | ||
runs-on: ubuntu-latest | ||
steps: | ||
- uses: actions/checkout@v2 | ||
- uses: actions/checkout@v3 | ||
with: | ||
fetch-depth: 0 | ||
submodules: true | ||
- uses: coursier/[email protected] | ||
- uses: coursier/setup-action@v1 | ||
- uses: coursier/setup-action@v1.2.1 | ||
with: | ||
jvm: 8 | ||
apps: cs | ||
- run: | | ||
./mill docs.generate --npm-install --yarn-run-build | ||
scripts/website/versioned-docs.sh --update | ||
scripts/website0/versioned-docs.sh --update | ||
if: startsWith(github.ref, 'refs/tags/v') | ||
shell: bash | ||
env: | ||
GH_TOKEN: ${{ secrets.GH_TOKEN }} | ||
WEBSITE_DIR: docs/website | ||
VERSIONED_DOCS_REPO: almond-sh/versioned-docs | ||
- run: | | ||
scripts/website/versioned-docs.sh | ||
scripts/website0/versioned-docs.sh | ||
./mill docs.generate --npm-install --yarn-run-build --relativize | ||
scripts/website/push-website.sh | ||
scripts/website0/push-website.sh | ||
shell: bash | ||
env: | ||
GH_TOKEN: ${{ secrets.GH_TOKEN }} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +0,0 @@ | ||
[submodule "scripts/website"] | ||
path = scripts/website | ||
url = https://github.com/coursier/docusaurus-mdoc-scripts.git | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
-Xss8M |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
0.9.8 | ||
0.10.5 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.