Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Use ostree-rs-ext 0.5.0 #3139

Merged
merged 1 commit into from
Nov 15, 2021
Merged

Use ostree-rs-ext 0.5.0 #3139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions .cci.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,7 @@ parallel insttests: {
# include our built rpm-ostree in the image
mkdir -p overrides/rpm
mv *.rpm overrides/rpm
# for now, we cherry-pick newer libsolv to test that it correctly detects our rpmdb
# https://github.com/coreos/rpm-ostree/issues/2548
(cd overrides/rpm && curl -LO https://kojipkgs.fedoraproject.org//packages/libsolv/0.7.17/1.fc33/x86_64/libsolv-0.7.17-1.fc33.x86_64.rpm)
${env.WORKSPACE}/ci/cosa-overrides.sh
coreos-assembler fetch
coreos-assembler build
${env.WORKSPACE}/ci/composepost-checks.sh
Expand Down
1 change: 1 addition & 0 deletions .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
.cosa
target
compose-cache/
209 changes: 181 additions & 28 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ openat = "0.1.21"
openat-ext = "^0.2.2"
openssl = "0.10.38"
os-release = "0.1.0"
ostree-ext = "0.3.0"
ostree-ext = "0.5.0"
paste = "1.0"
phf = { version = "0.10", features = ["macros"] }
rand = "0.8.4"
Expand Down
6 changes: 6 additions & 0 deletions ci/cosa-overrides.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/bash
# Inject ideally temporary overrides into our cosa build
# skopeo for containers https://github.com/containers/skopeo/pull/1476
cd overrides/rpm
curl -L --remote-name-all \
https://kojipkgs.fedoraproject.org//packages/skopeo/1.5.1/1.fc35/x86_64/skopeo-1.5.1-1.fc35.x86_64.rpm
Loading