diff --git a/.github/workflows/bootc-revdep.yml b/.github/workflows/bootc-revdep.yml index 4d04c5dd..0d553afe 100644 --- a/.github/workflows/bootc-revdep.yml +++ b/.github/workflows/bootc-revdep.yml @@ -29,7 +29,10 @@ jobs: - name: Checkout bootc repository uses: actions/checkout@v5 with: - repository: containers/bootc + repository: bootc-dev/bootc + # Use the PR that updates bootc to the current composefs-rs API. + # Once merged, change this back to 'main' or a release tag. + ref: refs/pull/1791/head path: bootc - name: Bootc Ubuntu Setup @@ -37,6 +40,12 @@ jobs: with: libvirt: true + - name: Install tmt + run: | + sudo apt-get install -y pipx + pipx install tmt[provision] + echo "$HOME/.local/bin" >> $GITHUB_PATH + - name: Patch bootc to use current composefs-rs working-directory: bootc run: | diff --git a/crates/composefs-oci/src/skopeo.rs b/crates/composefs-oci/src/skopeo.rs index 12972167..ce915df5 100644 --- a/crates/composefs-oci/src/skopeo.rs +++ b/crates/composefs-oci/src/skopeo.rs @@ -196,7 +196,7 @@ impl ImageOp { splitstream.write_inline(&raw_config); let config_id = self.repo.write_stream(splitstream, &content_id, None)?; - Ok((content_id, config_id)) + Ok((config_digest.to_string(), config_id)) } }