From 25105dda937109e8ae11104e251aff6772ed6d06 Mon Sep 17 00:00:00 2001 From: danicheg Date: Wed, 28 Aug 2024 16:34:14 +0300 Subject: [PATCH 1/2] Fix root module name --- build.sbt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/build.sbt b/build.sbt index 6b07194..a0028cb 100644 --- a/build.sbt +++ b/build.sbt @@ -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(".")) From 2771af988bd0c980de45e16da1b7ed3c9fcf4279 Mon Sep 17 00:00:00 2001 From: danicheg Date: Wed, 28 Aug 2024 16:35:18 +0300 Subject: [PATCH 2/2] Regenerate ci.yml --- .github/workflows/ci.yml | 72 ++++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c91ef72..4c81bbd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -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 @@ -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 @@ -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 + 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: