-
Notifications
You must be signed in to change notification settings - Fork 10
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 update/scala3-library-3.3.1
- Loading branch information
Showing
74 changed files
with
274 additions
and
361 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 |
|---|---|---|
|
|
@@ -15,20 +15,20 @@ on: | |
| tags: [v*] | ||
|
|
||
| env: | ||
| PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} | ||
| SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} | ||
| SONATYPE_CREDENTIAL_HOST: ${{ secrets.SONATYPE_CREDENTIAL_HOST }} | ||
| SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} | ||
| PGP_SECRET: ${{ secrets.PGP_SECRET }} | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
|
|
||
|
|
||
| concurrency: | ||
| group: ${{ github.workflow }} @ ${{ github.ref }} | ||
| cancel-in-progress: true | ||
|
|
||
| jobs: | ||
| build: | ||
| name: Build and Test | ||
| strategy: | ||
| matrix: | ||
| os: [ubuntu-latest] | ||
| scala: [3.3.0] | ||
| scala: [3] | ||
| java: [temurin@8, temurin@17] | ||
| project: [rootJS, rootJVM, rootNative] | ||
| exclude: | ||
|
|
@@ -37,23 +37,20 @@ jobs: | |
| - project: rootNative | ||
| java: temurin@17 | ||
| runs-on: ${{ matrix.os }} | ||
| timeout-minutes: 60 | ||
| steps: | ||
| - name: Checkout current branch (full) | ||
| uses: actions/checkout@v3 | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| fetch-depth: 0 | ||
|
|
||
| - name: Cache sbt | ||
| uses: actions/cache@v3 | ||
| 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: sbt update | ||
| if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' | ||
| run: 'nix develop .#${{ matrix.java }} -c sbt +update' | ||
|
|
||
| - name: sbt update | ||
| if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false' | ||
| run: 'nix develop .#${{ matrix.java }} -c sbt +update' | ||
|
|
||
| - name: Install Nix | ||
| uses: cachix/install-nix-action@v17 | ||
|
|
@@ -89,11 +86,11 @@ jobs: | |
|
|
||
| - name: Make target directories | ||
| if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') | ||
| run: mkdir -p modules/skunk-upickle/.native/target modules/backend/.native/target modules/munit/.js/target modules/skunk-upickle/.js/target target modules/skunk-circe/.jvm/target modules/postgres/.js/target modules/skunk/.native/target unidocs/target .js/target modules/skunk-circe/.native/target modules/core/.native/target site/target modules/backend/.jvm/target modules/skunk/.jvm/target modules/skunk-jsoniter/.native/target modules/skunk-jsoniter/.jvm/target modules/postgres/.jvm/target modules/core/.js/target examples/.js/target modules/skunk-circe/.js/target modules/doobie/.jvm/target modules/postgres/.native/target modules/doobie-circe/.jvm/target modules/core/.jvm/target .jvm/target .native/target modules/doobie-jsoniter/.jvm/target examples/.jvm/target modules/backend-tests/js/target modules/backend-tests/jvm/target modules/skunk-jsoniter/.js/target modules/doobie-upickle/.jvm/target modules/skunk-upickle/.jvm/target modules/skunk/.js/target modules/munit/.jvm/target modules/backend-tests/native/target mdoc-plantuml/target modules/backend/.js/target modules/munit/.native/target project/target | ||
| run: mkdir -p modules/skunk-upickle/.native/target modules/backend/.native/target modules/munit/.js/target modules/skunk-upickle/.js/target modules/skunk-circe/.jvm/target modules/postgres/.js/target modules/skunk/.native/target unidocs/target modules/skunk-circe/.native/target modules/core/.native/target modules/backend/.jvm/target modules/skunk/.jvm/target modules/skunk-jsoniter/.native/target modules/skunk-jsoniter/.jvm/target modules/postgres/.jvm/target modules/core/.js/target modules/skunk-circe/.js/target modules/doobie/.jvm/target modules/postgres/.native/target modules/doobie-circe/.jvm/target modules/core/.jvm/target modules/doobie-jsoniter/.jvm/target modules/skunk-jsoniter/.js/target modules/doobie-upickle/.jvm/target modules/skunk-upickle/.jvm/target modules/skunk/.js/target modules/munit/.jvm/target modules/backend/.js/target modules/munit/.native/target project/target | ||
|
|
||
| - name: Compress target directories | ||
| if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') | ||
| run: tar cf targets.tar modules/skunk-upickle/.native/target modules/backend/.native/target modules/munit/.js/target modules/skunk-upickle/.js/target target modules/skunk-circe/.jvm/target modules/postgres/.js/target modules/skunk/.native/target unidocs/target .js/target modules/skunk-circe/.native/target modules/core/.native/target site/target modules/backend/.jvm/target modules/skunk/.jvm/target modules/skunk-jsoniter/.native/target modules/skunk-jsoniter/.jvm/target modules/postgres/.jvm/target modules/core/.js/target examples/.js/target modules/skunk-circe/.js/target modules/doobie/.jvm/target modules/postgres/.native/target modules/doobie-circe/.jvm/target modules/core/.jvm/target .jvm/target .native/target modules/doobie-jsoniter/.jvm/target examples/.jvm/target modules/backend-tests/js/target modules/backend-tests/jvm/target modules/skunk-jsoniter/.js/target modules/doobie-upickle/.jvm/target modules/skunk-upickle/.jvm/target modules/skunk/.js/target modules/munit/.jvm/target modules/backend-tests/native/target mdoc-plantuml/target modules/backend/.js/target modules/munit/.native/target project/target | ||
| run: tar cf targets.tar modules/skunk-upickle/.native/target modules/backend/.native/target modules/munit/.js/target modules/skunk-upickle/.js/target modules/skunk-circe/.jvm/target modules/postgres/.js/target modules/skunk/.native/target unidocs/target modules/skunk-circe/.native/target modules/core/.native/target modules/backend/.jvm/target modules/skunk/.jvm/target modules/skunk-jsoniter/.native/target modules/skunk-jsoniter/.jvm/target modules/postgres/.jvm/target modules/core/.js/target modules/skunk-circe/.js/target modules/doobie/.jvm/target modules/postgres/.native/target modules/doobie-circe/.jvm/target modules/core/.jvm/target modules/doobie-jsoniter/.jvm/target modules/skunk-jsoniter/.js/target modules/doobie-upickle/.jvm/target modules/skunk-upickle/.jvm/target modules/skunk/.js/target modules/munit/.jvm/target modules/backend/.js/target modules/munit/.native/target project/target | ||
|
|
||
| - name: Upload target directories | ||
| if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') | ||
|
|
@@ -113,69 +110,106 @@ jobs: | |
| runs-on: ${{ matrix.os }} | ||
| steps: | ||
| - name: Checkout current branch (full) | ||
| uses: actions/checkout@v3 | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| fetch-depth: 0 | ||
|
|
||
| - name: Cache sbt | ||
| uses: actions/cache@v3 | ||
| 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: sbt update | ||
| if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' | ||
| run: 'nix develop .#${{ matrix.java }} -c sbt +update' | ||
|
|
||
| - name: sbt update | ||
| if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false' | ||
| run: 'nix develop .#${{ matrix.java }} -c sbt +update' | ||
|
|
||
| - name: Install Nix | ||
| uses: cachix/install-nix-action@v17 | ||
|
|
||
| - name: Download target directories (3.3.0, rootJS) | ||
| - name: Download target directories (3, rootJS) | ||
| uses: actions/download-artifact@v3 | ||
| with: | ||
| name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.0-rootJS | ||
| name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJS | ||
|
|
||
| - name: Inflate target directories (3.3.0, rootJS) | ||
| - name: Inflate target directories (3, rootJS) | ||
| run: | | ||
| tar xf targets.tar | ||
| rm targets.tar | ||
| - name: Download target directories (3.3.0, rootJVM) | ||
| - name: Download target directories (3, rootJVM) | ||
| uses: actions/download-artifact@v3 | ||
| with: | ||
| name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.0-rootJVM | ||
| name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJVM | ||
|
|
||
| - name: Inflate target directories (3.3.0, rootJVM) | ||
| - name: Inflate target directories (3, rootJVM) | ||
| run: | | ||
| tar xf targets.tar | ||
| rm targets.tar | ||
| - name: Download target directories (3.3.0, rootNative) | ||
| - name: Download target directories (3, rootNative) | ||
| uses: actions/download-artifact@v3 | ||
| with: | ||
| name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.0-rootNative | ||
| name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootNative | ||
|
|
||
| - name: Inflate target directories (3.3.0, rootNative) | ||
| - name: Inflate target directories (3, rootNative) | ||
| run: | | ||
| tar xf targets.tar | ||
| rm targets.tar | ||
| - name: Import signing key | ||
| if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE == '' | ||
| run: echo $PGP_SECRET | base64 -di | gpg --import | ||
| env: | ||
| PGP_SECRET: ${{ secrets.PGP_SECRET }} | ||
| PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} | ||
| run: echo $PGP_SECRET | base64 -d -i - | gpg --import | ||
|
|
||
| - name: Import signing key and strip passphrase | ||
| if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE != '' | ||
| env: | ||
| PGP_SECRET: ${{ secrets.PGP_SECRET }} | ||
| PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} | ||
| run: | | ||
| echo "$PGP_SECRET" | base64 -di > /tmp/signing-key.gpg | ||
| echo "$PGP_SECRET" | base64 -d -i - > /tmp/signing-key.gpg | ||
| echo "$PGP_PASSPHRASE" | gpg --pinentry-mode loopback --passphrase-fd 0 --import /tmp/signing-key.gpg | ||
| (echo "$PGP_PASSPHRASE"; echo; echo) | gpg --command-fd 0 --pinentry-mode loopback --change-passphrase $(gpg --list-secret-keys --with-colons 2> /dev/null | grep '^sec:' | cut --delimiter ':' --fields 5 | tail -n 1) | ||
| - name: Publish | ||
| env: | ||
| SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} | ||
| SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} | ||
| SONATYPE_CREDENTIAL_HOST: ${{ secrets.SONATYPE_CREDENTIAL_HOST }} | ||
| run: 'nix develop .#${{ matrix.java }} -c sbt tlCiRelease' | ||
|
|
||
| dependency-submission: | ||
| name: Submit Dependencies | ||
| if: github.event_name != 'pull_request' | ||
| strategy: | ||
| matrix: | ||
| os: [ubuntu-latest] | ||
| java: [temurin@8] | ||
| runs-on: ${{ matrix.os }} | ||
| steps: | ||
| - name: Checkout current branch (full) | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| fetch-depth: 0 | ||
|
|
||
| - name: sbt update | ||
| if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' | ||
| run: 'nix develop .#${{ matrix.java }} -c sbt +update' | ||
|
|
||
| - name: sbt update | ||
| if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false' | ||
| run: 'nix develop .#${{ matrix.java }} -c sbt +update' | ||
|
|
||
| - name: Install Nix | ||
| uses: cachix/install-nix-action@v17 | ||
|
|
||
| - name: Submit Dependencies | ||
| uses: scalacenter/sbt-dependency-submission@v2 | ||
| with: | ||
| modules-ignore: edomata_3 docs_3 examples_sjs1_3 edomata_3 edomata_3 examples_3 edomata-backend-tests_sjs1_3 edomata-backend-tests_3 edomata-backend-tests_native0.4_3 mdocplantuml_3 | ||
| configs-ignore: test scala-tool scala-doc-tool test-internal | ||
|
|
||
| post-build: | ||
| name: post build | ||
| needs: [build] | ||
|
|
@@ -192,25 +226,21 @@ jobs: | |
| strategy: | ||
| matrix: | ||
| os: [ubuntu-latest] | ||
| java: [temurin@8] | ||
| java: [temurin@17] | ||
| runs-on: ${{ matrix.os }} | ||
| steps: | ||
| - name: Checkout current branch (full) | ||
| uses: actions/checkout@v3 | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| fetch-depth: 0 | ||
|
|
||
| - name: Cache sbt | ||
| uses: actions/cache@v3 | ||
| 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: sbt update | ||
| if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' | ||
| run: 'nix develop .#${{ matrix.java }} -c sbt +update' | ||
|
|
||
| - name: sbt update | ||
| if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false' | ||
| run: 'nix develop .#${{ matrix.java }} -c sbt +update' | ||
|
|
||
| - name: Install Nix | ||
| uses: cachix/install-nix-action@v17 | ||
|
|
@@ -220,7 +250,7 @@ jobs: | |
|
|
||
| - name: Publish site | ||
| if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main' | ||
| uses: peaceiris/[email protected].0 | ||
| uses: peaceiris/[email protected].3 | ||
| with: | ||
| github_token: ${{ secrets.GITHUB_TOKEN }} | ||
| publish_dir: site/target/docs/site | ||
|
|
||
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,2 +1,2 @@ | ||
| version = 3.7.14 | ||
| version = 3.7.15 | ||
| runner.dialect = scala3 |
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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.