diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 72cb0d6..2e4c52a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,15 +34,18 @@ 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@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 @@ -52,11 +55,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 v20 LTS if: matrix.project == 'rootJS' - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 cache: npm - if: matrix.project == 'rootJS' @@ -102,7 +105,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 @@ -117,15 +120,18 @@ 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@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 +142,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 +152,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 +162,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,22 +197,25 @@ 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@17] runs-on: ${{ matrix.os }} steps: + - name: Install sbt + uses: sbt/setup-sbt@v1 + - 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 diff --git a/build.sbt b/build.sbt index 2116c06..b7294a4 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")) @@ -14,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 v20 LTS"), + params = Map("node-version" -> "20", "cache" -> "npm"), cond = Some("matrix.project == 'rootJS'"), ), WorkflowStep.Run( diff --git a/project/plugins.sbt b/project/plugins.sbt index 27dc44c..9d1b44d 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,5 @@ -addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.6.7") +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.2.0-RC1") +addSbtPlugin("com.armanbilge" % "sbt-scala-native-config-brew-github-actions" % "0.3.0")