Skip to content

Commit

Permalink
Merge branch 'dev' into add-info-of-community-modules
Browse files Browse the repository at this point in the history
  • Loading branch information
DDtKey authored Sep 26, 2023
2 parents cca9210 + 7c1be6f commit 70309e6
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 15 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- build --all-features
- build --no-default-features
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Get current MSRV from Cargo.toml
id: current_msrv
run: |
Expand All @@ -25,7 +25,7 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{steps.current_msrv.outputs.msrv}}
- uses: Swatinem/rust-cache@v2.5.0
- uses: Swatinem/rust-cache@v2.7.0
- run: cargo ${{ matrix['cargo-cmd'] }}

test:
Expand All @@ -37,7 +37,7 @@ jobs:
- test --all-features
- test --no-default-features
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Enable Docker Remote API on Localhost
shell: bash
run: |
Expand All @@ -46,21 +46,21 @@ jobs:
sudo systemctl daemon-reload
sudo systemctl restart docker
- uses: dtolnay/rust-toolchain@stable
- uses: Swatinem/rust-cache@v2.5.0
- uses: Swatinem/rust-cache@v2.7.0
- run: cargo ${{ matrix['cargo-cmd'] }}

style:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: dprint/check@v2.2

lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@1.67
with:
components: clippy
- uses: Swatinem/rust-cache@v2.5.0
- uses: Swatinem/rust-cache@v2.7.0
- run: cargo clippy --all-targets -- -D warnings
8 changes: 4 additions & 4 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@ jobs:
nightly-tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions-rs/toolchain@v1
id: toolchain
with:
profile: minimal
toolchain: nightly
override: true
- uses: Swatinem/rust-cache@v2.5.0
- uses: Swatinem/rust-cache@v2.7.0
- run: cargo test
nightly-lints:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions-rs/toolchain@v1
id: toolchain
with:
profile: minimal
toolchain: nightly
override: true
components: clippy
- uses: Swatinem/rust-cache@v2.5.0
- uses: Swatinem/rust-cache@v2.7.0
- run: cargo clippy --all-targets -- -D warnings
4 changes: 2 additions & 2 deletions .github/workflows/publish-new-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout merge commit
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.merge_commit_sha }}

Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:
echo "::set-output name=version::$VERSION"
- name: Create pull request for merging release-branch back into dev
uses: thomaseizinger/create-pull-request@1.3.0
uses: thomaseizinger/create-pull-request@1.3.1
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
head: release/${{ steps.extract-version.outputs.version }}
Expand Down
7 changes: 6 additions & 1 deletion testcontainers/src/clients/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,13 @@ impl Cli {
log::debug!("Executing command: {:?}", command);

let output = command.output().expect("Failed to execute docker command");
if !output.status.success() {
let stdout = std::str::from_utf8(&output.stdout).unwrap_or("{not utf8}");
let stderr = std::str::from_utf8(&output.stderr).unwrap_or("{not utf8}");
log::error!("Failed to start container.\nContainer stdout: {stdout}\nContainer stderr: {stderr}");
panic!("Failed to start container, check log for details")
}

assert!(output.status.success(), "failed to start container");
let container_id = String::from_utf8(output.stdout)
.expect("output is not valid utf8")
.trim()
Expand Down
2 changes: 1 addition & 1 deletion testimages/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ publish = false

[dependencies]
anyhow = "1.0.56"
axum = { version = "0.5.1", features = [ "http2" ] }
axum = { version = "0.6.20", features = [ "http2" ] }
tokio = { version = "1.17.0", features = [ "full" ] }

[build-dependencies]
Expand Down

0 comments on commit 70309e6

Please sign in to comment.