From e5d48f70e97fa8bdcbab61751631656f3779f383 Mon Sep 17 00:00:00 2001 From: "alejandrohdezma-steward[bot]" <80571129+alejandrohdezma-steward[bot]@users.noreply.github.com> Date: Thu, 1 Aug 2024 05:14:09 +0000 Subject: [PATCH 1/3] Update sbt-ci to 2.15.1 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 83f3a09..a7f208a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.1") addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "3.2.1") -addSbtPlugin("com.alejandrohdezma" % "sbt-ci" % "2.15.0") +addSbtPlugin("com.alejandrohdezma" % "sbt-ci" % "2.15.1") addSbtPlugin("com.alejandrohdezma" % "sbt-fix" % "0.7.1") addSbtPlugin("com.alejandrohdezma" % "sbt-github-mdoc" % "0.11.13") addSbtPlugin("com.alejandrohdezma" % "sbt-github-header" % "0.11.13") From d4b6b811a076cb8be829201376265a47bc0fa0cc Mon Sep 17 00:00:00 2001 From: "alejandrohdezma-steward[bot]" <80571129+alejandrohdezma-steward[bot]@users.noreply.github.com> Date: Thu, 1 Aug 2024 05:14:22 +0000 Subject: [PATCH 2/3] Run `sbt generateCiFiles` Executed command: sbt generateCiFiles --- .github/workflows/ci.yml | 6 ++++-- .github/workflows/release.yml | 25 ++++++++++++++++++------- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 08f39f8..e47a1cf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,11 +59,13 @@ jobs: - 17 steps: - name: Checkout project - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: ref: ${{ github.head_ref }} + repository: ${{ github.event.pull_request.head.repo.full_name }} + fetch-depth: 0 - - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0 + - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: distribution: "liberica" java-version: ${{ matrix.jdk }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 04e1591..87f08e6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout project - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: fetch-depth: 0 @@ -37,7 +37,7 @@ jobs: if: github.event_name == 'push' uses: alejandrohdezma/actions/check-semver-tag@v1 - - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0 + - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: distribution: "liberica" java-version: "11" @@ -46,7 +46,7 @@ jobs: - name: Run `sbt ci-publish` run: sbt ci-publish env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.ADMIN_GITHUB_TOKEN }} PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} PGP_SECRET: ${{ secrets.PGP_SECRET }} SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} @@ -54,18 +54,18 @@ jobs: documentation: needs: [release] - name: Updates documentation after latest release + name: Updates documentation and version policy after latest release if: github.event_name == 'push' runs-on: ubuntu-latest steps: - name: Checkout project - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: fetch-depth: 0 ref: main token: ${{ secrets.ADMIN_GITHUB_TOKEN }} - - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0 + - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: distribution: "liberica" java-version: "17" @@ -74,7 +74,7 @@ jobs: - name: Run `sbt ci-docs` run: sbt ci-docs env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.ADMIN_GITHUB_TOKEN }} GIT_DEPLOY_KEY: ${{ secrets.GIT_DEPLOY_KEY }} - name: Commit changes by `sbt ci-docs` @@ -82,3 +82,14 @@ jobs: with: message: Run `sbt ci-docs` [skip ci] branch: main + + - name: Reset `versionPolicyIntention` + run: sed -i -r 's/Compatibility\.(None|BinaryCompatible)/Compatibility.BinaryAndSourceCompatible/g' build.sbt + + - name: Commit `versionPolicyIntention` reset + uses: alejandrohdezma/actions/commit-and-push@v1 + with: + message: Reset `versionPolicyIntention` [skip ci] + branch: main + + \ No newline at end of file From 88cdeefcaf2657d397afa494730b150783e9577c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Hern=C3=A1ndez?= Date: Sat, 10 Aug 2024 08:49:18 +0200 Subject: [PATCH 3/3] Update build.sbt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Alejandro Hernández --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 474efa2..a31f622 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ ThisBuild / scalaVersion := _root_.scalafix.sbt.BuildInfo.scala212 ThisBuild / organization := "com.alejandrohdezma" ThisBuild / pluginCrossBuild / sbtVersion := "1.2.8" -ThisBuild / versionPolicyIntention := Compatibility.BinaryAndSourceCompatible +ThisBuild / versionPolicyIntention := Compatibility.None addCommandAlias("ci-test", "fix --check; versionPolicyCheck; mdoc; scripted") addCommandAlias("ci-docs", "github; mdoc; headerCreateAll")