Merge branch 'series/0.6.x'

typelevel · Aug 18, 2024 · 2fcd8d1 · 2fcd8d1
2 parents cd0c148 + a4c5ce4
commit 2fcd8d1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -60,7 +60,7 @@ jobs:
         run: |
           export SERVER_KEY=$(cat world/server.key)
           export SERVER_CERT=$(cat world/server.crt)
-          docker-compose up -d
+          docker compose up -d
 
       - name: Install brew formulae (ubuntu)
         if: (matrix.project == 'skunkNative') && startsWith(matrix.os, 'ubuntu')
@@ -143,7 +143,7 @@ jobs:
         run: |
           export SERVER_KEY=$(cat world/server.key)
           export SERVER_CERT=$(cat world/server.crt)
-          docker-compose up -d
+          docker compose up -d
 
       - name: Download target directories (2.13, skunkJS)
         uses: actions/download-artifact@v4
@@ -264,7 +264,7 @@ jobs:
         run: |
           export SERVER_KEY=$(cat world/server.key)
           export SERVER_CERT=$(cat world/server.crt)
-          docker-compose up -d
+          docker compose up -d
 
       - name: Submit Dependencies
         uses: scalacenter/sbt-dependency-submission@v2
@@ -306,7 +306,7 @@ jobs:
         run: |
           export SERVER_KEY=$(cat world/server.key)
           export SERVER_CERT=$(cat world/server.crt)
-          docker-compose up -d
+          docker compose up -d
 
       - name: Generate site
         run: sbt docs/tlSite
@@ -353,7 +353,7 @@ jobs:
         run: |
           export SERVER_KEY=$(cat world/server.key)
           export SERVER_CERT=$(cat world/server.crt)
-          docker-compose up -d
+          docker compose up -d
 
       - run: sbt coverage skunkJVM/test coverageReport
 

diff --git a/build.sbt b/build.sbt
@@ -26,7 +26,7 @@ ThisBuild / nativeBrewInstallCond := Some("matrix.project == 'skunkNative'")
 
 lazy val setupCertAndDocker = Seq(
   WorkflowStep.Run(
-    commands = List("export SERVER_KEY=$(cat world/server.key)", "export SERVER_CERT=$(cat world/server.crt)", "docker-compose up -d"),
+    commands = List("export SERVER_KEY=$(cat world/server.key)", "export SERVER_CERT=$(cat world/server.crt)", "docker compose up -d"),
     name = Some("Start up Postgres"),
   )
 )