diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d9958c50a..f42b70650 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -112,7 +112,7 @@ 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 != '' @@ -120,7 +120,7 @@ jobs: 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/.scalafmt-common.conf b/.scalafmt-common.conf index 626594604..3cb97af14 100644 --- a/.scalafmt-common.conf +++ b/.scalafmt-common.conf @@ -4,10 +4,11 @@ # this file by hand! Instead, if you wish to make changes, you should # make a PR to sbt-lucuma. -version = "3.7.12" +version = "3.7.14" style = default runner.dialect = scala3 +runner.optimizer.maxVisitsPerToken = 20000 # Avoids SearchStateExploded exceptions maxColumn = 100 project.git = true diff --git a/modules/ui/src/main/scala/lucuma/ui/components/SolarProgress.scala b/modules/ui/src/main/scala/lucuma/ui/components/SolarProgress.scala index 89fb707dd..05b643989 100644 --- a/modules/ui/src/main/scala/lucuma/ui/components/SolarProgress.scala +++ b/modules/ui/src/main/scala/lucuma/ui/components/SolarProgress.scala @@ -19,7 +19,7 @@ object SolarProgress { p.css, <.div( ^.cls := "mars-orbit orbit", - <.div(^.cls := "planet mars"), + <.div(^.cls := "planet mars"), <.div( ^.cls := "earth-orbit orbit", <.div(^.cls := "planet earth"),