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

Fix root module name #511

Merged
merged 2 commits into from
Aug 28, 2024
Merged

Fix root module name #511

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
25105dd
Fix root module name
danicheg Aug 28, 2024
2771af9
Regenerate ci.yml
danicheg Aug 28, 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
72 changes: 36 additions & 36 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ jobs:
os: [ubuntu-22.04]
scala: [2.12, 3, 2.13]
java: [temurin@8, temurin@17]
project: [rootJS, rootJVM, rootNative]
project: [mouseJVM, mouseNative, mouseJS]
exclude:
- scala: 2.12
java: temurin@17
- scala: 3
java: temurin@17
- project: rootJS
- project: mouseNative
java: temurin@17
- project: rootNative
- project: mouseJS
java: temurin@17
runs-on: ${{ matrix.os }}
timeout-minutes: 60
Expand Down Expand Up @@ -85,14 +85,14 @@ jobs:
if: matrix.java == 'temurin@8' && matrix.os == 'ubuntu-22.04'
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

- name: nativeLink
if: matrix.project == 'rootNative'
if: matrix.project == 'mouseNative'
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' Test/nativeLink

- name: scalaJSLink
if: matrix.project == 'mouseJS'
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' Test/scalaJSLinkerResult

- name: Test
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test

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

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

- name: Inflate target directories (2.12, rootJS)
- name: Inflate target directories (2.12, mouseJVM)
run: |
tar xf targets.tar
rm targets.tar

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

- name: Inflate target directories (2.12, rootJVM)
- name: Inflate target directories (2.12, mouseNative)
run: |
tar xf targets.tar
rm targets.tar

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

- name: Inflate target directories (2.12, rootNative)
- name: Inflate target directories (2.12, mouseJS)
run: |
tar xf targets.tar
rm targets.tar

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

- name: Inflate target directories (3, rootJS)
- name: Inflate target directories (3, mouseJVM)
run: |
tar xf targets.tar
rm targets.tar

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

- name: Inflate target directories (3, rootJVM)
- name: Inflate target directories (3, mouseNative)
run: |
tar xf targets.tar
rm targets.tar

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

- name: Inflate target directories (3, rootNative)
- name: Inflate target directories (3, mouseJS)
run: |
tar xf targets.tar
rm targets.tar

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

- name: Inflate target directories (2.13, rootJS)
- name: Inflate target directories (2.13, mouseJVM)
run: |
tar xf targets.tar
rm targets.tar

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

- name: Inflate target directories (2.13, rootJVM)
- name: Inflate target directories (2.13, mouseNative)
run: |
tar xf targets.tar
rm targets.tar

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

- name: Inflate target directories (2.13, rootNative)
- name: Inflate target directories (2.13, mouseJS)
run: |
tar xf targets.tar
rm targets.tar
Expand Down Expand Up @@ -325,7 +325,7 @@ jobs:
- name: Submit Dependencies
uses: scalacenter/sbt-dependency-submission@v2
with:
modules-ignore: mouse_2.12 mouse_3 mouse_2.13 docs_2.12 docs_3 docs_2.13 mouse_2.12 mouse_3 mouse_2.13 mouse_2.12 mouse_3 mouse_2.13
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Essentially, that PR fixes an issue on that line.

modules-ignore: docs_2.12 docs_3 docs_2.13 mousejvm_2.12 mousejvm_3 mousejvm_2.13 mousenative_2.12 mousenative_3 mousenative_2.13 mousejs_2.12 mousejs_3 mousejs_2.13
configs-ignore: test scala-tool scala-doc-tool test-internal

site:
Expand Down
6 changes: 1 addition & 5 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,7 @@ ThisBuild / tlCiReleaseBranches := Seq("main")
ThisBuild / tlSiteApiUrl := Some(url("https://www.javadoc.io/doc/org.typelevel/mouse_2.13/latest"))
ThisBuild / githubWorkflowOSes := Seq("ubuntu-22.04")

lazy val root = tlCrossRootProject
.settings(
name := "mouse"
)
.aggregate(cross)
lazy val mouse = tlCrossRootProject.aggregate(cross)

lazy val cross = crossProject(JSPlatform, JVMPlatform, NativePlatform)
.in(file("."))
Expand Down