From 4c802008dcf88cc8c44dbffeec265483eb90add3 Mon Sep 17 00:00:00 2001 From: "nimble-agar-steward[bot]" <106723251+nimble-agar-steward[bot]@users.noreply.github.com> Date: Fri, 26 Apr 2024 07:16:12 +0000 Subject: [PATCH 1/8] Update sbt-scala-native-config-brew-github-actions to 0.3.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 34adfb0..fb78310 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.6.6") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.15.0") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17") -addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.2.0-RC1") +addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.3.0") From d867b142e08945f5baffe3e2c354e5866665c9d3 Mon Sep 17 00:00:00 2001 From: "nimble-agar-steward[bot]" <106723251+nimble-agar-steward[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2024 19:53:01 +0000 Subject: [PATCH 2/8] Update sbt-typelevel to 0.7.4 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index f570bac..317b625 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.6.7") +addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.4") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.15.0") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17") addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.2.0-RC1") From 127d0267ab0aa0d48efc6ff00282311945bfc056 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Wed, 16 Oct 2024 20:10:55 +0000 Subject: [PATCH 3/8] Remove deprecated setting --- build.sbt | 2 -- 1 file changed, 2 deletions(-) diff --git a/build.sbt b/build.sbt index 9725ac7..d045374 100644 --- a/build.sbt +++ b/build.sbt @@ -5,8 +5,6 @@ ThisBuild / organizationName := "Arman Bilge" ThisBuild / developers += tlGitHubDev("armanbilge", "Arman Bilge") ThisBuild / startYear := Some(2023) -ThisBuild / tlSonatypeUseLegacyHost := false - ThisBuild / crossScalaVersions := Seq("3.3.1") ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("17")) From b308a66f36b74bc46eec6da022cebdae24f3740d Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Wed, 16 Oct 2024 20:12:15 +0000 Subject: [PATCH 4/8] Regenerate workflow --- .github/workflows/ci.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 72cb0d6..1f5396f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,14 +35,14 @@ jobs: timeout-minutes: 60 steps: - name: Checkout current branch (full) - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Setup Java (temurin@17) id: setup-java-temurin-17 if: matrix.java == 'temurin@17' - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 17 @@ -102,7 +102,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 @@ -118,14 +118,14 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Setup Java (temurin@17) id: setup-java-temurin-17 if: matrix.java == 'temurin@17' - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 17 @@ -136,7 +136,7 @@ jobs: run: sbt +update - 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 @@ -146,7 +146,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 @@ -156,7 +156,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 @@ -191,7 +191,7 @@ 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] @@ -199,14 +199,14 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Setup Java (temurin@17) id: setup-java-temurin-17 if: matrix.java == 'temurin@17' - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 17 From 2861ff9b8d455a031e4750110a9d0121e5219894 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Wed, 16 Oct 2024 20:15:37 +0000 Subject: [PATCH 5/8] Bump Node.js and setup-node action --- .github/workflows/ci.yml | 6 +++--- build.sbt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1f5396f..afba88a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,11 +52,11 @@ jobs: if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false' run: sbt +update - - name: Setup NodeJS v18 LTS + - name: Setup NodeJS v22 LTS if: matrix.project == 'rootJS' - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 22 cache: npm - if: matrix.project == 'rootJS' diff --git a/build.sbt b/build.sbt index d045374..bff2c31 100644 --- a/build.sbt +++ b/build.sbt @@ -12,9 +12,9 @@ ThisBuild / tlJdkRelease := Some(8) ThisBuild / githubWorkflowBuildPreamble ++= Seq( WorkflowStep.Use( - UseRef.Public("actions", "setup-node", "v3"), - name = Some("Setup NodeJS v18 LTS"), - params = Map("node-version" -> "18", "cache" -> "npm"), + UseRef.Public("actions", "setup-node", "v4"), + name = Some("Setup NodeJS v22 LTS"), + params = Map("node-version" -> "22", "cache" -> "npm"), cond = Some("matrix.project == 'rootJS'"), ), WorkflowStep.Run( From 9b32a0b7f1e3bdbec7ed43396f53d2172ef1ee9c Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Wed, 16 Oct 2024 20:34:14 +0000 Subject: [PATCH 6/8] Workaround --- project/plugins.sbt | 1 + 1 file changed, 1 insertion(+) diff --git a/project/plugins.sbt b/project/plugins.sbt index 4c5be8b..9d1b44d 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,5 @@ addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.4") +addSbtPlugin("org.typelevel" % "sbt-typelevel-github-actions" % "0.7.4") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17") addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.3.0") From 32cb4865e79e6c7f9d843db044ad5045c4e32e8e Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Wed, 16 Oct 2024 22:49:16 +0000 Subject: [PATCH 7/8] Regenerate workflow --- .github/workflows/ci.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index afba88a..5b12a44 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: @@ -117,6 +120,9 @@ jobs: java: [temurin@17] runs-on: ${{ matrix.os }} steps: + - name: Install sbt + uses: sbt/setup-sbt@v1 + - name: Checkout current branch (full) uses: actions/checkout@v4 with: @@ -198,6 +204,9 @@ jobs: java: [temurin@17] runs-on: ${{ matrix.os }} steps: + - name: Install sbt + uses: sbt/setup-sbt@v1 + - name: Checkout current branch (full) uses: actions/checkout@v4 with: From e8545ccaa35fa3f62b28864e14916d7b95d965b5 Mon Sep 17 00:00:00 2001 From: Arman Bilge Date: Wed, 16 Oct 2024 23:05:09 +0000 Subject: [PATCH 8/8] Rollback Node.js version --- .github/workflows/ci.yml | 4 ++-- build.sbt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5b12a44..2e4c52a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,11 +55,11 @@ jobs: if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false' run: sbt +update - - name: Setup NodeJS v22 LTS + - name: Setup NodeJS v20 LTS if: matrix.project == 'rootJS' uses: actions/setup-node@v4 with: - node-version: 22 + node-version: 20 cache: npm - if: matrix.project == 'rootJS' diff --git a/build.sbt b/build.sbt index bff2c31..610e47f 100644 --- a/build.sbt +++ b/build.sbt @@ -13,8 +13,8 @@ ThisBuild / tlJdkRelease := Some(8) ThisBuild / githubWorkflowBuildPreamble ++= Seq( WorkflowStep.Use( UseRef.Public("actions", "setup-node", "v4"), - name = Some("Setup NodeJS v22 LTS"), - params = Map("node-version" -> "22", "cache" -> "npm"), + name = Some("Setup NodeJS v20 LTS"), + params = Map("node-version" -> "20", "cache" -> "npm"), cond = Some("matrix.project == 'rootJS'"), ), WorkflowStep.Run(