Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update scala3-library, ... to 3.3.3 in series/3.x #4021

Merged
merged 2 commits into from
Mar 4, 2024
Merged

Update scala3-library, ... to 3.3.3 in series/3.x #4021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f011b1
Update scala3-library, ... to 3.3.3 in series/3.x
typelevel-steward[bot] Feb 29, 2024
55ce360
Regenerate GitHub Actions workflow
typelevel-steward[bot] Feb 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-14]
scala: [3.3.1, 2.12.19, 2.13.12]
scala: [3.3.3, 2.12.19, 2.13.12]
java:
- temurin@8
- temurin@11
Expand All @@ -37,9 +37,9 @@ jobs:
- graalvm@17
ci: [ciJVM, ciNative, ciJS, ciFirefox, ciChrome]
exclude:
- scala: 3.3.1
- scala: 3.3.3
java: temurin@11
- scala: 3.3.1
- scala: 3.3.3
java: temurin@21
- scala: 2.12.19
java: temurin@11
Expand All @@ -50,10 +50,10 @@ jobs:
- scala: 2.12.19
java: graalvm@17
- os: windows-latest
scala: 3.3.1
scala: 3.3.3
ci: ciJVM
- os: macos-14
scala: 3.3.1
scala: 3.3.3
ci: ciJVM
- os: windows-latest
scala: 2.12.19
Expand All @@ -64,9 +64,9 @@ jobs:
- os: macos-14
java: temurin@8
- ci: ciFirefox
scala: 3.3.1
scala: 3.3.3
- ci: ciChrome
scala: 3.3.1
scala: 3.3.3
- ci: ciFirefox
scala: 2.12.19
- ci: ciChrome
Expand Down Expand Up @@ -239,24 +239,24 @@ jobs:
run: sbt githubWorkflowCheck

- name: Check that scalafix has been run on JVM
if: matrix.ci == 'ciJVM' && matrix.scala != '3.3.1' && matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
if: matrix.ci == 'ciJVM' && matrix.scala != '3.3.3' && matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
shell: bash
run: sbt '++ ${{ matrix.scala }}' 'rootJVM/scalafixAll --check'

- name: Check that scalafix has been run on JS
if: matrix.ci == 'ciJS' && matrix.scala != '3.3.1' && matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
if: matrix.ci == 'ciJS' && matrix.scala != '3.3.3' && matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
shell: bash
run: sbt '++ ${{ matrix.scala }}' 'rootJS/scalafixAll --check'

- name: Check that scalafix has been run on Native
if: matrix.ci == 'ciNative' && matrix.scala != '3.3.1' && matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
if: matrix.ci == 'ciNative' && matrix.scala != '3.3.3' && matrix.java == 'temurin@8' && matrix.os == 'ubuntu-latest'
shell: bash
run: sbt '++ ${{ matrix.scala }}' 'rootNative/scalafixAll --check'

- shell: bash
run: sbt '++ ${{ matrix.scala }}' '${{ matrix.ci }}'

- if: (matrix.scala == '2.13.12' || matrix.scala == '3.3.1') && matrix.ci == 'ciJVM' && matrix.java == 'temurin@17'
- if: (matrix.scala == '2.13.12' || matrix.scala == '3.3.3') && matrix.ci == 'ciJVM' && matrix.java == 'temurin@17'
shell: bash
run: sbt '++ ${{ matrix.scala }}' docs/mdoc

Expand Down Expand Up @@ -392,32 +392,32 @@ jobs:
if: matrix.java == 'graalvm@17' && steps.setup-java-graalvm-17.outputs.cache-hit == 'false'
run: sbt +update

- name: Download target directories (3.3.1, ciJVM)
- name: Download target directories (3.3.3, ciJVM)
uses: actions/download-artifact@v4
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.1-ciJVM
name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.3-ciJVM

- name: Inflate target directories (3.3.1, ciJVM)
- name: Inflate target directories (3.3.3, ciJVM)
run: |
tar xf targets.tar
rm targets.tar

- name: Download target directories (3.3.1, ciNative)
- name: Download target directories (3.3.3, ciNative)
uses: actions/download-artifact@v4
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.1-ciNative
name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.3-ciNative

- name: Inflate target directories (3.3.1, ciNative)
- name: Inflate target directories (3.3.3, ciNative)
run: |
tar xf targets.tar
rm targets.tar

- name: Download target directories (3.3.1, ciJS)
- name: Download target directories (3.3.3, ciJS)
uses: actions/download-artifact@v4
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.1-ciJS
name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.3-ciJS

- name: Inflate target directories (3.3.1, ciJS)
- name: Inflate target directories (3.3.3, ciJS)
run: |
tar xf targets.tar
rm targets.tar
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ val MacOS = "macos-14"

val Scala212 = "2.12.19"
val Scala213 = "2.13.12"
val Scala3 = "3.3.1"
val Scala3 = "3.3.3"

ThisBuild / crossScalaVersions := Seq(Scala3, Scala212, Scala213)
ThisBuild / githubWorkflowScalaVersions := crossScalaVersions.value
Expand Down
Loading