-
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'topic/sbt-typelevel' into topic/sbt-typelevel-site
- Loading branch information
Showing
777 changed files
with
16,420 additions
and
151 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 |
---|---|---|
|
@@ -32,14 +32,6 @@ jobs: | |
java: [temurin@8, temurin@17, graalvm@11] | ||
project: [rootJS, rootJVM, rootNative] | ||
exclude: | ||
- project: rootJS | ||
java: temurin@17 | ||
- project: rootJS | ||
java: graalvm@11 | ||
- project: rootNative | ||
java: temurin@17 | ||
- project: rootNative | ||
java: graalvm@11 | ||
- scala: 2.13.8 | ||
java: temurin@17 | ||
- scala: 2.13.8 | ||
|
@@ -48,6 +40,14 @@ jobs: | |
java: temurin@17 | ||
- scala: 3.0.2 | ||
java: graalvm@11 | ||
- project: rootJS | ||
java: temurin@17 | ||
- project: rootJS | ||
java: graalvm@11 | ||
- project: rootNative | ||
java: temurin@17 | ||
- project: rootNative | ||
java: graalvm@11 | ||
- project: rootNative | ||
scala: 3.0.2 | ||
runs-on: ${{ matrix.os }} | ||
|
@@ -120,6 +120,10 @@ jobs: | |
- name: Check that workflows are up to date | ||
run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' 'project /' githubWorkflowCheck | ||
|
||
- name: Check headers and formatting | ||
if: matrix.java == 'temurin@8' | ||
run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck | ||
|
||
- name: scalaJSLink | ||
if: matrix.project == 'rootJS' | ||
run: sbt 'project ${{ matrix.project }}' '++${{ matrix.scala }}' Test/scalaJSLinkerResult | ||
|
@@ -423,83 +427,6 @@ jobs: | |
cd scalafix | ||
sbt test | ||
linting: | ||
name: Linting | ||
strategy: | ||
matrix: | ||
os: [ubuntu-latest] | ||
scala: [2.12.15] | ||
java: [temurin@8] | ||
runs-on: ${{ matrix.os }} | ||
steps: | ||
- name: Checkout current branch (full) | ||
uses: actions/checkout@v2 | ||
with: | ||
fetch-depth: 0 | ||
|
||
- name: Download Java (temurin@8) | ||
id: download-java-temurin-8 | ||
if: matrix.java == 'temurin@8' | ||
uses: typelevel/download-java@v1 | ||
with: | ||
distribution: temurin | ||
java-version: 8 | ||
|
||
- name: Setup Java (temurin@8) | ||
if: matrix.java == 'temurin@8' | ||
uses: actions/setup-java@v2 | ||
with: | ||
distribution: jdkfile | ||
java-version: 8 | ||
jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }} | ||
|
||
- name: Download Java (temurin@17) | ||
id: download-java-temurin-17 | ||
if: matrix.java == 'temurin@17' | ||
uses: typelevel/download-java@v1 | ||
with: | ||
distribution: temurin | ||
java-version: 17 | ||
|
||
- name: Setup Java (temurin@17) | ||
if: matrix.java == 'temurin@17' | ||
uses: actions/setup-java@v2 | ||
with: | ||
distribution: jdkfile | ||
java-version: 17 | ||
jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }} | ||
|
||
- name: Download Java (graalvm@11) | ||
id: download-java-graalvm-11 | ||
if: matrix.java == 'graalvm@11' | ||
uses: typelevel/download-java@v1 | ||
with: | ||
distribution: graalvm | ||
java-version: 11 | ||
|
||
- name: Setup Java (graalvm@11) | ||
if: matrix.java == 'graalvm@11' | ||
uses: actions/setup-java@v2 | ||
with: | ||
distribution: jdkfile | ||
java-version: 11 | ||
jdkFile: ${{ steps.download-java-graalvm-11.outputs.jdkFile }} | ||
|
||
- name: Cache sbt | ||
uses: actions/cache@v2 | ||
with: | ||
path: | | ||
~/.sbt | ||
~/.ivy2/cache | ||
~/.coursier/cache/v1 | ||
~/.cache/coursier/v1 | ||
~/AppData/Local/Coursier/Cache/v1 | ||
~/Library/Caches/Coursier/v1 | ||
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} | ||
|
||
- name: Check formatting | ||
run: sbt '++${{ matrix.scala }}' scalafmtSbtCheck +scalafmtCheckAll | ||
|
||
site: | ||
name: Generate Site | ||
strategy: | ||
|
@@ -578,7 +505,7 @@ jobs: | |
run: sbt '++${{ matrix.scala }}' docs/tlSite | ||
|
||
- name: Publish site | ||
if: github.event_name != 'pull_request' && github.ref == 'refs/heads/topic/sbt-typelevel-site' | ||
if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main' | ||
uses: peaceiris/[email protected] | ||
with: | ||
github_token: ${{ secrets.GITHUB_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,4 +1,4 @@ | ||
version=3.5.0 | ||
version=3.5.1 | ||
align.openParenCallSite = true | ||
align.openParenDefnSite = true | ||
maxColumn = 120 | ||
|
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
21 changes: 21 additions & 0 deletions
21
algebra-core/src/main/scala/algebra/instances/StaticMethods.scala
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
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
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
21 changes: 21 additions & 0 deletions
21
algebra-core/src/main/scala/algebra/instances/bigDecimal.scala
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
21 changes: 21 additions & 0 deletions
21
algebra-core/src/main/scala/algebra/instances/bigInt.scala
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
21 changes: 21 additions & 0 deletions
21
algebra-core/src/main/scala/algebra/instances/bitSet.scala
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
21 changes: 21 additions & 0 deletions
21
algebra-core/src/main/scala/algebra/instances/boolean.scala
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
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
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.