Fix for ensure_config + re-enable bootc revdep CI

.github/workflows/bootc-revdep.yml

@@ -29,14 +29,23 @@ 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
         uses: ./bootc/.github/actions/bootc-ubuntu-setup
         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: |

crates/composefs-oci/src/skopeo.rs

@@ -196,7 +196,7 @@ impl<ObjectID: FsVerityHashValue> ImageOp<ObjectID> {
             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))
         }
     }