Skip to content

Commit

Permalink
Merge branch 'main' into scalapy-rich-print-rebased
Browse files Browse the repository at this point in the history
 Conflicts:
	.github/workflows/ci.yml
	build.sc
  • Loading branch information
alexarchambault committed Aug 18, 2022
2 parents 822d56f + 1c7fe15 commit 706a4f0
Show file tree
Hide file tree
Showing 33 changed files with 1,477 additions and 602 deletions.
56 changes: 29 additions & 27 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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 }}
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules
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
1 change: 1 addition & 0 deletions .mill-jvm-opts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-Xss8M
2 changes: 1 addition & 1 deletion .mill-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.9.8
0.10.5
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,13 @@

## Documentation

See the project [website](https://almond.sh) for more details.
See the project [website](https://almond.sh) for more details

## Developer documentation

Find it in [`docs/pages/dev-from-sources.md`](https://github.com/almond-sh/almond/blob/master/docs/pages/dev-from-sources.md) in the sources for more details, and soon
[on the website](https://almond.sh/docs/dev-from-sources) when it will be
updated (it's currently out-of-date there).

## Code of Conduct

Expand Down
Loading

0 comments on commit 706a4f0

Please sign in to comment.