From fa5a1e85d9a73f6af1a4f88dce5550a4410cc413 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Fri, 17 May 2024 14:50:13 +0200 Subject: [PATCH 1/6] Don't wait for tests to have run to run release job --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d1a05e2..260e806 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,6 @@ jobs: SCALA_VERSION: ${{ matrix.SCALA_VERSION }} publish: - needs: test if: github.event_name == 'push' runs-on: ubuntu-latest steps: From ff5c73e065567d36fd250469f60754db7ae53c33 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Fri, 17 May 2024 14:47:05 +0200 Subject: [PATCH 2/6] Update secrets --- .github/scripts/gpg-setup.sh | 10 ++++++++++ .github/workflows/ci.yml | 11 +++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) create mode 100755 .github/scripts/gpg-setup.sh diff --git a/.github/scripts/gpg-setup.sh b/.github/scripts/gpg-setup.sh new file mode 100755 index 0000000..ad58f40 --- /dev/null +++ b/.github/scripts/gpg-setup.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env sh + +# from https://github.com/coursier/apps/blob/f1d2bf568bf466a98569a85c3f23c5f3a8eb5360/.github/scripts/gpg-setup.sh + +echo $PGP_SECRET | base64 --decode | gpg --import --no-tty --batch --yes + +echo "allow-loopback-pinentry" >>~/.gnupg/gpg-agent.conf +echo "pinentry-mode loopback" >>~/.gnupg/gpg.conf + +gpg-connect-agent reloadagent /bye diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 260e806..18ba782 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,10 +35,13 @@ jobs: - uses: coursier/setup-action@v1.3.0 with: jvm: 8 + - run: .github/scripts/gpg-setup.sh + env: + PGP_SECRET: ${{ secrets.PUBLISH_SECRET_KEY }} - name: Release run: sbtn ci-release env: - PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} - PGP_SECRET: ${{ secrets.PGP_SECRET }} - SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} - SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} + PGP_PASSPHRASE: ${{ secrets.PUBLISH_SECRET_KEY_PASSWORD }} + PGP_SECRET: ${{ secrets.PUBLISH_SECRET_KEY }} + SONATYPE_PASSWORD: ${{ secrets.PUBLISH_PASSWORD }} + SONATYPE_USERNAME: ${{ secrets.PUBLISH_USER }} From 349e2039740b7b5800ad2159a2c4d575e2b71f23 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Fri, 17 May 2024 15:01:51 +0200 Subject: [PATCH 3/6] Update sbt-scalafmt to 2.5.2 (#433) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 065728c..dc710d5 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,4 +4,4 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") addSbtPlugin("org.scala-js" % "sbt-jsdependencies" % "1.0.2") addSbtPlugin("io.get-coursier" % "sbt-shading" % "2.1.4") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") From 82f4bba308a31cdff62f3f072db8d7e67e54e089 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 May 2024 15:05:13 +0200 Subject: [PATCH 4/6] Bump actions/checkout from 3 to 4 (#435) Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 18ba782..58c4bc6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: matrix: SCALA_VERSION: ["2.12.19", "2.13.14"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: coursier/cache-action@v6 - uses: coursier/setup-action@v1.3.0 with: @@ -30,7 +30,7 @@ jobs: if: github.event_name == 'push' runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: coursier/cache-action@v6 - uses: coursier/setup-action@v1.3.0 with: From 36c8745d8820ec5b681e56040bb0688982ec2c60 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 May 2024 15:05:20 +0200 Subject: [PATCH 5/6] Bump coursier/setup-action from 1.3.0 to 1.3.5 (#434) Bumps [coursier/setup-action](https://github.com/coursier/setup-action) from 1.3.0 to 1.3.5. - [Release notes](https://github.com/coursier/setup-action/releases) - [Commits](https://github.com/coursier/setup-action/compare/v1.3.0...v1.3.5) --- updated-dependencies: - dependency-name: coursier/setup-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 58c4bc6..93b98f6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: coursier/cache-action@v6 - - uses: coursier/setup-action@v1.3.0 + - uses: coursier/setup-action@v1.3.5 with: jvm: 8 - run: | @@ -32,7 +32,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: coursier/cache-action@v6 - - uses: coursier/setup-action@v1.3.0 + - uses: coursier/setup-action@v1.3.5 with: jvm: 8 - run: .github/scripts/gpg-setup.sh From 5e28acb387f6599ec761e8e49ff092256d995d53 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Fri, 17 May 2024 15:15:07 +0200 Subject: [PATCH 6/6] Update jquery to 3.7.1 (#418) --- project/WebDeps.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/WebDeps.scala b/project/WebDeps.scala index f506ae9..9baf2e9 100644 --- a/project/WebDeps.scala +++ b/project/WebDeps.scala @@ -7,7 +7,7 @@ object WebDeps { } def bootstrap = "org.webjars.bower" % "bootstrap" % "3.4.1" - def jquery = "org.webjars.bower" % "jquery" % "3.6.3" + def jquery = "org.webjars.bower" % "jquery" % "3.7.1" def plotlyJs = "org.webjars.bower" % "plotly.js" % Versions.plotlyJs def prism = "org.webjars.bower" % "prism" % "1.16.0"