From 9d275c925e1917d4b7d6de5114e8a2d3a473498d Mon Sep 17 00:00:00 2001 From: Sam Pillsworth Date: Tue, 10 Dec 2024 20:01:36 -0500 Subject: [PATCH 1/3] bump sbt-typelevel to 0.7.4 --- .github/workflows/ci.yml | 59 ++++++++++++++++++++++++++++------------ project/plugins.sbt | 2 +- 2 files changed, 43 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3fc82f9d..d90982a8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,6 +34,9 @@ jobs: runs-on: ${{ matrix.os }} timeout-minutes: 60 steps: + - name: Install sbt + uses: sbt/setup-sbt@v1 + - name: Checkout current branch (full) uses: actions/checkout@v4 with: @@ -42,7 +45,7 @@ jobs: - name: Setup Java (temurin@8) id: setup-java-temurin-8 if: matrix.java == 'temurin@8' - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 8 @@ -88,7 +91,7 @@ jobs: - name: Upload target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main') - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}-${{ matrix.project }} path: targets.tar @@ -103,6 +106,9 @@ jobs: java: [temurin@8] runs-on: ${{ matrix.os }} steps: + - name: Install sbt + uses: sbt/setup-sbt@v1 + - name: Checkout current branch (full) uses: actions/checkout@v4 with: @@ -111,7 +117,7 @@ jobs: - name: Setup Java (temurin@8) id: setup-java-temurin-8 if: matrix.java == 'temurin@8' - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 8 @@ -122,7 +128,7 @@ jobs: run: sbt +update - name: Download target directories (2.12, rootJS) - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootJS @@ -132,7 +138,7 @@ jobs: rm targets.tar - name: Download target directories (2.12, rootJVM) - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootJVM @@ -142,7 +148,7 @@ jobs: rm targets.tar - name: Download target directories (2.12, rootNative) - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootNative @@ -152,7 +158,7 @@ jobs: rm targets.tar - name: Download target directories (3, rootJS) - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJS @@ -162,7 +168,7 @@ jobs: rm targets.tar - name: Download target directories (3, rootJVM) - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJVM @@ -172,7 +178,7 @@ jobs: rm targets.tar - name: Download target directories (3, rootNative) - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootNative @@ -182,7 +188,7 @@ jobs: rm targets.tar - name: Download target directories (2.13, rootJS) - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJS @@ -192,7 +198,7 @@ jobs: rm targets.tar - name: Download target directories (2.13, rootJVM) - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJVM @@ -202,7 +208,7 @@ jobs: rm targets.tar - name: Download target directories (2.13, rootNative) - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootNative @@ -237,13 +243,16 @@ jobs: dependency-submission: name: Submit Dependencies - if: github.event_name != 'pull_request' + if: github.event.repository.fork == false && github.event_name != 'pull_request' strategy: matrix: os: [ubuntu-latest] java: [temurin@8] runs-on: ${{ matrix.os }} steps: + - name: Install sbt + uses: sbt/setup-sbt@v1 + - name: Checkout current branch (full) uses: actions/checkout@v4 with: @@ -252,7 +261,7 @@ jobs: - name: Setup Java (temurin@8) id: setup-java-temurin-8 if: matrix.java == 'temurin@8' - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 8 @@ -273,9 +282,12 @@ jobs: strategy: matrix: os: [ubuntu-latest] - java: [temurin@8] + java: [temurin@11] runs-on: ${{ matrix.os }} steps: + - name: Install sbt + uses: sbt/setup-sbt@v1 + - name: Checkout current branch (full) uses: actions/checkout@v4 with: @@ -284,7 +296,7 @@ jobs: - name: Setup Java (temurin@8) id: setup-java-temurin-8 if: matrix.java == 'temurin@8' - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 8 @@ -294,12 +306,25 @@ jobs: if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' run: sbt +update + - name: Setup Java (temurin@11) + id: setup-java-temurin-11 + if: matrix.java == 'temurin@11' + uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: 11 + cache: sbt + + - name: sbt update + if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false' + run: sbt +update + - name: Generate site run: sbt docs/tlSite - name: Publish site if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main' - uses: peaceiris/actions-gh-pages@v3.9.3 + uses: peaceiris/actions-gh-pages@v4.0.0 with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: modules/docs/target/docs/site diff --git a/project/plugins.sbt b/project/plugins.sbt index 0ecda02b..64bcd661 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,6 +2,6 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.15.0") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.6") -val sbtTypelevelVersion = "0.6.1" +val sbtTypelevelVersion = "0.7.4" addSbtPlugin("org.typelevel" % "sbt-typelevel" % sbtTypelevelVersion) addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % sbtTypelevelVersion) From eadca0b4d04b1d03408a1b2c0f05e119fa5cf5bc Mon Sep 17 00:00:00 2001 From: Sam Pillsworth Date: Tue, 10 Dec 2024 20:24:59 -0500 Subject: [PATCH 2/3] bump scala versions as well --- build.sbt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 829e0966..bfdd430a 100644 --- a/build.sbt +++ b/build.sbt @@ -1,8 +1,8 @@ Global / onChangedBuildSource := ReloadOnSourceChanges -val Scala212 = "2.12.18" -val Scala213 = "2.13.12" -val Scala3 = "3.3.1" +val Scala212 = "2.12.19" +val Scala213 = "2.13.15" +val Scala3 = "3.3.3" ThisBuild / tlBaseVersion := "0.6" ThisBuild / startYear := Some(2018) From 167a698bc6ea18b228ad58dfc0e4885aefb4c219 Mon Sep 17 00:00:00 2001 From: Sam Pillsworth Date: Tue, 10 Dec 2024 20:32:04 -0500 Subject: [PATCH 3/3] increase jvm heap for nativeLink --- .jvmopts | 1 + 1 file changed, 1 insertion(+) create mode 100644 .jvmopts diff --git a/.jvmopts b/.jvmopts new file mode 100644 index 00000000..56aefe05 --- /dev/null +++ b/.jvmopts @@ -0,0 +1 @@ +-Xmx4G