Skip to content

Commit

Permalink
Fix how Docker Compose is called
Browse files Browse the repository at this point in the history
  • Loading branch information
jdno committed Oct 1, 2024
1 parent 39152f3 commit aee55d2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---

name: CI
on:
push:
Expand Down Expand Up @@ -46,13 +45,13 @@ jobs:
run: rustup self update && rustup update stable

- name: Start the local environment
run: docker-compose up -d
run: docker compose up -d

- name: Run the local release process for channel ${{ matrix.channel }}
run: ./run.sh ${{ matrix.channel }}

- name: Validate the generated signatures
run: docker-compose exec -T local /src/local/check-signature.sh ${{ matrix.channel }}
run: docker compose exec -T local /src/local/check-signature.sh ${{ matrix.channel }}

- name: Remove the previously installed ${{ matrix.channel }} toolchain
run: rustup toolchain remove ${{ matrix.channel }}
Expand Down
6 changes: 3 additions & 3 deletions run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ fi
channel="$1"
override_commit="${2-}"

container_id="$(docker-compose ps -q local)"
container_id="$(docker compose ps -q local)"
if [[ "${container_id}" == "" ]]; then
container_status="missing"
else
Expand All @@ -22,7 +22,7 @@ if [[ "${container_status}" != "running" ]]; then
echo "Error: the local environment is not running!"
echo "You can start it by running in a new terminal the following command:"
echo
echo " docker-compose up"
echo " docker compose up"
echo
exit 1
fi
Expand All @@ -31,4 +31,4 @@ fi
cargo build --release

# Run the command inside the docker environment.
docker-compose exec -T local /src/local/run.sh "${channel}" "${override_commit}"
docker compose exec -T local /src/local/run.sh "${channel}" "${override_commit}"

0 comments on commit aee55d2

Please sign in to comment.