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.

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

Fix CI #86

Merged
merged 4 commits into from
Oct 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 3 additions & 4 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 All @@ -78,7 +77,7 @@ jobs:
if: github.event_name == 'push' && github.repository == 'rust-lang/promote-release' && github.ref == 'refs/heads/master'

- name: Upload the Docker image we built to GitHub Actions artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: docker-image
path: promote-release.tar.zstd
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
---
version: '3'

services:
minio:
image: quay.io/minio/minio:RELEASE.2023-04-13T03-08-07Z
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}"
2 changes: 1 addition & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ impl Context {
.arg("cp")
.arg("--recursive")
.arg("--only-show-errors")
.arg(&self.s3_artifacts_url(&format!("{}/", rev)))
.arg(self.s3_artifacts_url(&format!("{}/", rev)))
.arg(format!("{}/", dl.display())))?;

let mut files = dl.read_dir()?;
Expand Down
Loading