Skip to content
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
50 changes: 49 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,57 @@ jobs:
- name: Test ostree-rs-ext
run: ./ci/test-ostree-rs-ext.sh

test-old-skopeo:
name: Test (old skopeo)
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v6
with:
ref: ${{ github.event.pull_request.head.sha }}
fetch-depth: 20
- name: Test in AlmaLinux bootc container (skopeo 1.18)
run: |
set -euxo pipefail
rm -rf .ci-cargo-home
mkdir -p .ci-cargo-home
docker run --rm \
-e CARGO_TARGET_DIR=/tmp/target \
-e EXPECT_BLOB_STREAM_SOURCE=GetBlob \
-v "$PWD:/src" \
-v "$PWD/.ci-cargo-home:/root/.cargo" \
-w /src \
quay.io/almalinuxorg/almalinux-bootc:10.0 \
sh -lc 'dnf -y install cargo rustc openssl-devel pkg-config >/dev/null && skopeo --version && cargo test --all-features -- --nocapture --quiet'
sudo rm -rf .ci-cargo-home

test-new-skopeo:
name: Test (new skopeo)
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v6
with:
ref: ${{ github.event.pull_request.head.sha }}
fetch-depth: 20
- name: Test in CentOS Stream 10 container (skopeo >= 1.19)
run: |
set -euxo pipefail
rm -rf .ci-cargo-home
mkdir -p .ci-cargo-home
docker run --rm \
-e CARGO_TARGET_DIR=/tmp/target \
-e EXPECT_BLOB_STREAM_SOURCE=GetRawBlob \
-v "$PWD:/src" \
-v "$PWD/.ci-cargo-home:/root/.cargo" \
-w /src \
quay.io/centos/centos:stream10 \
sh -lc 'dnf -y install cargo rustc skopeo openssl-devel pkg-config >/dev/null && skopeo --version && cargo test --all-features -- --nocapture --quiet'
sudo rm -rf .ci-cargo-home

required-checks:
if: always()
needs: [semver-checks, build-test]
needs: [semver-checks, build-test, test-old-skopeo, test-new-skopeo]
runs-on: ubuntu-latest
steps:
- name: Check all jobs
Expand Down
3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ rust-version = "1.70.0"

[dependencies]
futures-util = "0.3.13"
hex = "0.4.3"
# NOTE when bumping this in a semver-incompatible way, because we re-export it you
# must also bump the semver of this project.
# See also https://github.com/youki-dev/oci-spec-rs/pull/288
Expand All @@ -18,6 +19,7 @@ rustix = { version = "1.0", features = ["process", "fs", "net"] }
serde = { features = ["derive"], version = "1.0.125" }
serde_json = "1.0.64"
semver = "1.0.4"
sha2 = "0.10.9"
thiserror = "2"
tokio = { features = ["fs", "io-util", "macros", "process", "rt", "sync"], version = "1" }
tracing = "0.1"
Expand All @@ -29,6 +31,7 @@ itertools = "0.14.0"
anyhow = "1.0"
bytes = "1.5"
clap = { version = "4.4", features = ["derive"] }
ocidir = "0.7.2"
tempfile = "3.20.0"

[lib]
Expand Down
Loading
Loading