From b22649ddc30b7d760f68fa3dac6fd7e1f67f7dc9 Mon Sep 17 00:00:00 2001 From: d_m Date: Wed, 14 Aug 2024 17:08:18 -0400 Subject: [PATCH 1/2] Replace 'docker-compose' with 'docker compose' --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 992875be..9e2c2b71 100644 --- a/build.sbt +++ b/build.sbt @@ -28,7 +28,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"), ) ) From 35a3c2636c9bcea544d1bc2c02769cf217447e04 Mon Sep 17 00:00:00 2001 From: mpilquist Date: Sun, 18 Aug 2024 08:41:37 -0400 Subject: [PATCH 2/2] Regenerate workflow --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fa084899..3f4fd4a8 100644 --- 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.12, skunkJS) uses: actions/download-artifact@v4 @@ -294,7 +294,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 @@ -361,7 +361,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 @@ -408,7 +408,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