Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace 'docker-compose' with 'docker compose' #1116

Merged
merged 2 commits into from
Aug 18, 2024
Merged

Replace 'docker-compose' with 'docker compose' #1116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b22649d
Replace 'docker-compose' with 'docker compose'
non Aug 14, 2024
35a3c26
Regenerate workflow
mpilquist Aug 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
)
)
Expand Down
Loading