From 246a44b3546e4b5d75f302c262c9a89a722364d3 Mon Sep 17 00:00:00 2001 From: Hossein Naderi Date: Wed, 15 Nov 2023 17:48:58 +0000 Subject: [PATCH 1/5] Update sbt-typelevel, sbt-typelevel-site to 0.6.2 --- project/plugins.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index a007d46..b0a5bf9 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ -addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.6.0") -addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.6.0") +addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.6.2") +addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.6.2") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.4.0") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.16") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") From 77eeef79b2abbe794c602d98f1fbe4fd603c20bc Mon Sep 17 00:00:00 2001 From: Hossein Naderi Date: Wed, 15 Nov 2023 17:49:43 +0000 Subject: [PATCH 2/5] Run prePR with sbt-typelevel Executed command: sbt tlPrePrBotHook --- .github/workflows/ci.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0f04dc1..dcf56c8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -340,7 +340,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - java: [temurin@8] + java: [temurin@11] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -377,6 +377,19 @@ jobs: vcpkg integrate install vcpkg install --triplet x64-windows libyaml + - name: Setup Java (temurin@11) + id: setup-java-temurin-11 + if: matrix.java == 'temurin@11' + uses: actions/setup-java@v3 + 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 From 8a2690d1f12e5049643594f14d7bc102ef7c6949 Mon Sep 17 00:00:00 2001 From: Hossein Naderi Date: Thu, 16 Nov 2023 00:44:15 +0000 Subject: [PATCH 3/5] Revert commit(s) 77eeef7, 246a44b --- .github/workflows/ci.yml | 15 +-------------- project/plugins.sbt | 4 ++-- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dcf56c8..0f04dc1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -340,7 +340,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - java: [temurin@11] + java: [temurin@8] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -377,19 +377,6 @@ jobs: vcpkg integrate install vcpkg install --triplet x64-windows libyaml - - name: Setup Java (temurin@11) - id: setup-java-temurin-11 - if: matrix.java == 'temurin@11' - uses: actions/setup-java@v3 - 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 diff --git a/project/plugins.sbt b/project/plugins.sbt index b0a5bf9..a007d46 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ -addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.6.2") -addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.6.2") +addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.6.0") +addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.6.0") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.4.0") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.16") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") From 5df31352ea6f07aacdad59444be5d1cd74b46c29 Mon Sep 17 00:00:00 2001 From: Hossein Naderi Date: Thu, 16 Nov 2023 00:44:18 +0000 Subject: [PATCH 4/5] Update sbt-typelevel, sbt-typelevel-site to 0.6.2 --- project/plugins.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 5ffb4a1..b11a5f0 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ -addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.6.0") -addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.6.0") +addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.6.2") +addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.6.2") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.1") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.16") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") From fc59cf713d5b8ad322661ee4c857d35cdb2f9004 Mon Sep 17 00:00:00 2001 From: Hossein Naderi Date: Thu, 16 Nov 2023 00:45:03 +0000 Subject: [PATCH 5/5] Run prePR with sbt-typelevel Executed command: sbt tlPrePrBotHook --- .github/workflows/ci.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0f04dc1..dcf56c8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -340,7 +340,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - java: [temurin@8] + java: [temurin@11] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -377,6 +377,19 @@ jobs: vcpkg integrate install vcpkg install --triplet x64-windows libyaml + - name: Setup Java (temurin@11) + id: setup-java-temurin-11 + if: matrix.java == 'temurin@11' + uses: actions/setup-java@v3 + 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