From 3fd1eb2bbf34966b6e3431b9272909b84a0454fc Mon Sep 17 00:00:00 2001 From: Olivier Filangi Date: Wed, 21 Feb 2024 12:14:39 +0100 Subject: [PATCH 1/6] update plugins.sbt with ci-release plugin --- project/plugins.sbt | 1 + 1 file changed, 1 insertion(+) diff --git a/project/plugins.sbt b/project/plugins.sbt index bf90e16..adc7803 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,3 +4,4 @@ addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.21.1") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.7") addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.1") addSbtPlugin("io.crashbox" % "sbt-gpg" % "0.2.1") +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") From 2afb8620920d16fd6262e9a9bdf3ceaf87a1b38a Mon Sep 17 00:00:00 2001 From: Olivier Filangi Date: Wed, 21 Feb 2024 12:33:52 +0100 Subject: [PATCH 2/6] fix snapshot gen --- .github/workflows/release.yml | 2 +- build.sbt | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6940ca0..dc6824d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,7 +10,7 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: distribution: temurin java-version: 8 diff --git a/build.sbt b/build.sbt index c276382..80ba76a 100644 --- a/build.sbt +++ b/build.sbt @@ -4,8 +4,9 @@ lazy val version_n3="1.17.2" def getPackageSetting = Seq( name := "n3js", - version := scala.util.Properties.envOrElse("PROG_VERSION", version_n3 ), - scalaVersion := "2.13.10", + version := scala.util.Properties.envOrElse("PROG_VERSION", version_n3 )+"-SNAPSHOT", + scalaVersion := "2.13.12", + versionScheme := Some("early-semver"), organization := "com.github.p2m2", organizationName := "p2m2", organizationHomepage := Some(url("https://www6.inrae.fr/p2m2")), From 1df2f38abef1a6c9864a6276671c341ff208f1cc Mon Sep 17 00:00:00 2001 From: Olivier Filangi Date: Wed, 21 Feb 2024 12:39:33 +0100 Subject: [PATCH 3/6] fix test --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dc6824d..7aa430b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/setup-java@v4 with: distribution: temurin - java-version: 8 + java-version: 21 cache: sbt - run: sbt ci-release env: From aa9e97564f67c588a2e73accb941c8110f088f76 Mon Sep 17 00:00:00 2001 From: Olivier Filangi Date: Wed, 21 Feb 2024 12:41:30 +0100 Subject: [PATCH 4/6] fix test --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7aa430b..7588adf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,10 +10,10 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v3 with: distribution: temurin - java-version: 21 + java-version: 11 cache: sbt - run: sbt ci-release env: From d3069232a2e310b20a6302d6df0631abfc4bb5d5 Mon Sep 17 00:00:00 2001 From: Olivier Filangi Date: Wed, 21 Feb 2024 12:45:32 +0100 Subject: [PATCH 5/6] fix test --- .github/workflows/ci.yml | 7 ++++++- .github/workflows/release.yml | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 33fc350..3980287 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,8 +19,13 @@ jobs: fetch-depth: 0 # see: https://frontside.com/blog/2020-05-26-github-actions-pull_request/#how-does-pull_request-affect-actionscheckout ref: ${{ github.event.pull_request.head.sha }} - + - name: Run tests + uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: 21 + cache: sbt run: sbt clean coverage test - name: Upload coverage data to Coveralls diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7588adf..7aa430b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,10 +10,10 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: distribution: temurin - java-version: 11 + java-version: 21 cache: sbt - run: sbt ci-release env: From 5ce59fe4b263b75624a2e7a01bb163322c81b4c4 Mon Sep 17 00:00:00 2001 From: Olivier Filangi Date: Wed, 21 Feb 2024 13:11:12 +0100 Subject: [PATCH 6/6] fix test --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3980287..b41cf16 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,12 +20,12 @@ jobs: # see: https://frontside.com/blog/2020-05-26-github-actions-pull_request/#how-does-pull_request-affect-actionscheckout ref: ${{ github.event.pull_request.head.sha }} - - name: Run tests - uses: actions/setup-java@v4 + - uses: actions/setup-java@v4 with: distribution: temurin java-version: 21 - cache: sbt + cache: sbt + - name: Run tests run: sbt clean coverage test - name: Upload coverage data to Coveralls