Merge pull request #795 from typelevel/update/sbt-typelevel-0.5.4

Update sbt-typelevel, sbt-typelevel-site to 0.5.4
typelevel · Oct 7, 2023 · dfe3e36 · dfe3e36
2 parents b4ed2b0 + 7e35fd4
commit dfe3e36
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -251,15 +251,15 @@ jobs:
         env:
           PGP_SECRET: ${{ secrets.PGP_SECRET }}
           PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
-        run: echo $PGP_SECRET | base64 -di | gpg --import
+        run: echo $PGP_SECRET | base64 -d -i - | gpg --import
 
       - name: Import signing key and strip passphrase
         if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE != ''
         env:
           PGP_SECRET: ${{ secrets.PGP_SECRET }}
           PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
         run: |
-          echo "$PGP_SECRET" | base64 -di > /tmp/signing-key.gpg
+          echo "$PGP_SECRET" | base64 -d -i - > /tmp/signing-key.gpg
           echo "$PGP_PASSPHRASE" | gpg --pinentry-mode loopback --passphrase-fd 0 --import /tmp/signing-key.gpg
           (echo "$PGP_PASSPHRASE"; echo; echo) | gpg --command-fd 0 --pinentry-mode loopback --change-passphrase $(gpg --list-secret-keys --with-colons 2> /dev/null | grep '^sec:' | cut --delimiter ':' --fields 5 | tail -n 1)
 

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -2,6 +2,6 @@ addSbtPlugin("org.scala-js"       % "sbt-scalajs"                   % "1.14.0")
 addSbtPlugin("org.scala-native"   % "sbt-scala-native"              % "0.4.15")
 addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
 addSbtPlugin("pl.project13.scala" % "sbt-jmh"                       % "0.4.6")
-val sbtTypelevelVersion = "0.5.3"
+val sbtTypelevelVersion = "0.5.4"
 addSbtPlugin("org.typelevel" % "sbt-typelevel"      % sbtTypelevelVersion)
 addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % sbtTypelevelVersion)