Skip to content
New issue

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

#

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

Already on GitHub? # to your account

chore: fix CI error; use docker compose instead of old style and new rust version #72

Merged
merged 2 commits into from
Aug 17, 2024
Merged

chore: fix CI error; use docker compose instead of old style and new rust version #72

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
e185b8c
chore: replace docker-compose to docker compose
Miyoshi-Ryota Aug 17, 2024
97044dc
chore: Update rust version to fix complie error
Miyoshi-Ryota Aug 17, 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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,5 @@ async fn main() -> Result<(), async_ssh2_tokio::Error> {
```

## Running Tests
1. install docker and docker-compose
1. install docker and docker compose
2. run shell script `./tests/run_unit_tests.sh`
2 changes: 1 addition & 1 deletion tests/async-ssh2-tokio/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rust:1.71.0
FROM rust:1.80.0

ENV ASYNC_SSH2_TEST_HOST_IP=10.10.10.2
ENV ASYNC_SSH2_TEST_HOST_USER=root
Expand Down
8 changes: 4 additions & 4 deletions tests/run_unit_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ cd "${0%/*}" || exit 1

cd ..

docker-compose -f ./tests/docker-compose.yml build --no-cache || exit 1
docker compose -f ./tests/docker-compose.yml build --no-cache || exit 1

docker-compose -f ./tests/docker-compose.yml up -d || exit 1
docker compose -f ./tests/docker-compose.yml up -d || exit 1

docker-compose -f ./tests/docker-compose.yml exec -T async-ssh2-tokio cargo test -- --test-threads=2
docker compose -f ./tests/docker-compose.yml exec -T async-ssh2-tokio cargo test -- --test-threads=2
RET=$?

docker-compose -f ./tests/docker-compose.yml down
docker compose -f ./tests/docker-compose.yml down

exit $RET
Loading