diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4777ce0..19b40be 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -112,9 +112,6 @@ jobs: repository: ${{ inputs.repo }} - - name: Expose GitHub Runtime - uses: crazy-max/ghaction-github-runtime@b3a9207c0e1ef41f4cf215303c976869d0c2c1c4 # v3.0.0 - - uses: extractions/setup-just@69d82fb0233557aec017ef13706851d0694e0f1d # v1 - name: Run Build @@ -122,7 +119,6 @@ jobs: GH_TOKEN: ${{ github.token }} GH_PR_EVENT_NUMBER: ${{ inputs.pr_event_number }} COSIGN_PRIVATE_KEY: ${{ secrets.TEST_SIGNING_SECRET }} - BB_BUILDKIT_CACHE_GHA: true run: just test-docker-build rechunk-build: @@ -152,9 +148,6 @@ jobs: repository: ${{ inputs.repo }} - - name: Expose GitHub Runtime - uses: crazy-max/ghaction-github-runtime@b3a9207c0e1ef41f4cf215303c976869d0c2c1c4 # v3.0.0 - - uses: extractions/setup-just@69d82fb0233557aec017ef13706851d0694e0f1d # v1 - name: Run Build @@ -162,7 +155,6 @@ jobs: GH_TOKEN: ${{ github.token }} GH_PR_EVENT_NUMBER: ${{ inputs.pr_event_number }} COSIGN_PRIVATE_KEY: ${{ secrets.TEST_SIGNING_SECRET }} - BB_BUILDKIT_CACHE_GHA: true run: | export CARGO_HOME=$HOME/.cargo just test-fresh-rechunk-build @@ -201,9 +193,6 @@ jobs: repository: ${{ inputs.repo }} - - name: Expose GitHub Runtime - uses: crazy-max/ghaction-github-runtime@b3a9207c0e1ef41f4cf215303c976869d0c2c1c4 # v3.0.0 - - uses: extractions/setup-just@69d82fb0233557aec017ef13706851d0694e0f1d # v1 - name: Run Build @@ -211,7 +200,6 @@ jobs: GH_TOKEN: ${{ github.token }} GH_PR_EVENT_NUMBER: ${{ inputs.pr_event_number }} COSIGN_PRIVATE_KEY: ${{ secrets.TEST_SIGNING_SECRET }} - BB_BUILDKIT_CACHE_GHA: true run: just test-arm64-build docker-build-external-login: @@ -254,9 +242,6 @@ jobs: - - name: Expose GitHub Runtime - uses: crazy-max/ghaction-github-runtime@b3a9207c0e1ef41f4cf215303c976869d0c2c1c4 # v3.0.0 - - uses: extractions/setup-just@69d82fb0233557aec017ef13706851d0694e0f1d # v1 - name: Run Build @@ -264,7 +249,6 @@ jobs: GH_TOKEN: ${{ github.token }} GH_PR_EVENT_NUMBER: ${{ inputs.pr_event_number }} COSIGN_PRIVATE_KEY: ${{ secrets.TEST_SIGNING_SECRET }} - BB_BUILDKIT_CACHE_GHA: true run: just test-docker-build-external-login podman-build: @@ -300,7 +284,6 @@ jobs: GH_TOKEN: ${{ github.token }} GH_PR_EVENT_NUMBER: ${{ inputs.pr_event_number }} COSIGN_PRIVATE_KEY: ${{ secrets.TEST_SIGNING_SECRET }} - BB_BUILDKIT_CACHE_GHA: true run: just test-podman-build buildah-build: @@ -336,7 +319,6 @@ jobs: GH_TOKEN: ${{ github.token }} GH_PR_EVENT_NUMBER: ${{ inputs.pr_event_number }} COSIGN_PRIVATE_KEY: ${{ secrets.TEST_SIGNING_SECRET }} - BB_BUILDKIT_CACHE_GHA: true run: just test-buildah-build iso-from-image: @@ -368,9 +350,6 @@ jobs: repository: ${{ inputs.repo }} - - name: Expose GitHub Runtime - uses: crazy-max/ghaction-github-runtime@b3a9207c0e1ef41f4cf215303c976869d0c2c1c4 # v3.0.0 - - uses: extractions/setup-just@69d82fb0233557aec017ef13706851d0694e0f1d # v1 - name: Run Build @@ -378,7 +357,6 @@ jobs: GH_TOKEN: ${{ github.token }} GH_PR_EVENT_NUMBER: ${{ inputs.pr_event_number }} COSIGN_PRIVATE_KEY: ${{ secrets.TEST_SIGNING_SECRET }} - BB_BUILDKIT_CACHE_GHA: true run: just test-generate-iso-image iso-from-recipe: @@ -410,9 +388,6 @@ jobs: repository: ${{ inputs.repo }} - - name: Expose GitHub Runtime - uses: crazy-max/ghaction-github-runtime@b3a9207c0e1ef41f4cf215303c976869d0c2c1c4 # v3.0.0 - - uses: extractions/setup-just@69d82fb0233557aec017ef13706851d0694e0f1d # v1 - name: Run Build @@ -420,5 +395,4 @@ jobs: GH_TOKEN: ${{ github.token }} GH_PR_EVENT_NUMBER: ${{ inputs.pr_event_number }} COSIGN_PRIVATE_KEY: ${{ secrets.TEST_SIGNING_SECRET }} - BB_BUILDKIT_CACHE_GHA: true run: just test-generate-iso-image diff --git a/Cargo.lock b/Cargo.lock index 880a7ea..60c32b8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -51,16 +51,16 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" dependencies = [ "cfg-if", - "getrandom 0.2.16", + "getrandom 0.3.2", "once_cell", "serde", "version_check", - "zerocopy 0.7.35", + "zerocopy", ] [[package]] @@ -244,9 +244,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "aws-lc-rs" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b756939cb2f8dc900aa6dcd505e6e2428e9cae7ff7b028c49e3946efa70878" +checksum = "93fcc8f365936c834db5514fc45aee5b1202d677e6b40e48468aaaa8183ca8c7" dependencies = [ "aws-lc-sys", "untrusted 0.7.1", @@ -255,9 +255,9 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.28.2" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa9b6986f250236c27e5a204062434a773a13243d2ffc2955f37bdba4c5c6a1" +checksum = "61b1d86e7705efe1be1b569bab41d4fa1e14e220b60a160f78de2db687add079" dependencies = [ "bindgen", "cc", @@ -268,9 +268,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.74" +version = "0.3.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" +checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002" dependencies = [ "addr2line", "cfg-if", @@ -644,7 +644,7 @@ version = "0.54.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9718806c4a2fe9e8a56fd736f97b340dd10ed1be8ed733ed50449f351dc33cae" dependencies = [ - "ahash 0.8.11", + "ahash 0.8.12", "async-trait", "cached_proc_macro 0.23.0", "cached_proc_macro_types", @@ -662,7 +662,7 @@ version = "0.55.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b0839c297f8783316fcca9d90344424e968395413f0662a5481f79c6648bbc14" dependencies = [ - "ahash 0.8.11", + "ahash 0.8.12", "async-trait", "cached_proc_macro 0.24.0", "cached_proc_macro_types", @@ -715,9 +715,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.20" +version = "1.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04da6a0d40b948dfc4fa8f5bbf402b0fc1a64a28dbf7d12ffd683550f2c1b63a" +checksum = "8691782945451c1c383942c4874dbe63814f61cb57ef773cda2972682b7bb3c0" dependencies = [ "jobserver", "libc", @@ -753,9 +753,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chrono" -version = "0.4.40" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c" +checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d" dependencies = [ "android-tzdata", "iana-time-zone", @@ -833,9 +833,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.48" +version = "4.5.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be8c97f3a6f02b9e24cadc12aaba75201d18754b53ea0a9d99642f806ccdb4c9" +checksum = "c91d3baa3bcd889d60e6ef28874126a0b384fd225ab83aa6d8a801c519194ce1" dependencies = [ "clap", ] @@ -1287,9 +1287,9 @@ dependencies = [ [[package]] name = "docker_credential" -version = "1.3.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31951f49556e34d90ed28342e1df7e1cb7a229c4cab0aecc627b5d91edd41d07" +checksum = "1d89dfcba45b4afad7450a99b39e751590463e45c04728cf555d36bb66940de8" dependencies = [ "base64 0.21.7", "serde", @@ -1733,9 +1733,9 @@ checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "git2" -version = "0.20.1" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5220b8ba44c68a9a7f7a7659e864dd73692e417ef0211bea133c7b74e031eeb9" +checksum = "2deb07a133b1520dc1a5690e9bd08950108873d7ed5de38dcc74d3b5ebffa110" dependencies = [ "bitflags 2.9.0", "libc", @@ -1789,15 +1789,15 @@ version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ - "ahash 0.8.11", + "ahash 0.8.12", "allocator-api2", ] [[package]] name = "hashbrown" -version = "0.15.2" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" +checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3" dependencies = [ "foldhash", ] @@ -1808,7 +1808,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1" dependencies = [ - "hashbrown 0.15.2", + "hashbrown 0.15.3", ] [[package]] @@ -1948,7 +1948,7 @@ dependencies = [ "tokio", "tokio-rustls", "tower-service", - "webpki-roots", + "webpki-roots 0.26.11", ] [[package]] @@ -1997,21 +1997,22 @@ dependencies = [ [[package]] name = "icu_collections" -version = "1.5.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47" dependencies = [ "displaydoc", + "potential_utf", "yoke", "zerofrom", "zerovec", ] [[package]] -name = "icu_locid" -version = "1.5.0" +name = "icu_locale_core" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a" dependencies = [ "displaydoc", "litemap", @@ -2020,31 +2021,11 @@ dependencies = [ "zerovec", ] -[[package]] -name = "icu_locid_transform" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_locid_transform_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_locid_transform_data" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7515e6d781098bf9f7205ab3fc7e9709d34554ae0b21ddbcb5febfa4bc7df11d" - [[package]] name = "icu_normalizer" -version = "1.5.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979" dependencies = [ "displaydoc", "icu_collections", @@ -2052,67 +2033,54 @@ dependencies = [ "icu_properties", "icu_provider", "smallvec", - "utf16_iter", - "utf8_iter", - "write16", "zerovec", ] [[package]] name = "icu_normalizer_data" -version = "1.5.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e8338228bdc8ab83303f16b797e177953730f601a96c25d10cb3ab0daa0cb7" +checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3" [[package]] name = "icu_properties" -version = "1.5.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +checksum = "2549ca8c7241c82f59c80ba2a6f415d931c5b58d24fb8412caa1a1f02c49139a" dependencies = [ "displaydoc", "icu_collections", - "icu_locid_transform", + "icu_locale_core", "icu_properties_data", "icu_provider", - "tinystr", + "potential_utf", + "zerotrie", "zerovec", ] [[package]] name = "icu_properties_data" -version = "1.5.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85fb8799753b75aee8d2a21d7c14d9f38921b54b3dbda10f5a3c7a7b82dba5e2" +checksum = "8197e866e47b68f8f7d95249e172903bec06004b18b2937f1095d40a0c57de04" [[package]] name = "icu_provider" -version = "1.5.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af" dependencies = [ "displaydoc", - "icu_locid", - "icu_provider_macros", + "icu_locale_core", "stable_deref_trait", "tinystr", "writeable", "yoke", "zerofrom", + "zerotrie", "zerovec", ] -[[package]] -name = "icu_provider_macros" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.101", -] - [[package]] name = "ident_case" version = "1.0.1" @@ -2132,9 +2100,9 @@ dependencies = [ [[package]] name = "idna_adapter" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" dependencies = [ "icu_normalizer", "icu_properties", @@ -2158,7 +2126,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" dependencies = [ "equivalent", - "hashbrown 0.15.2", + "hashbrown 0.15.3", "serde", ] @@ -2352,7 +2320,7 @@ version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1b46a0365a611fbf1d2143104dcf910aada96fafd295bab16c60b802bf6fa1d" dependencies = [ - "ahash 0.8.11", + "ahash 0.8.12", "base64 0.22.1", "bytecount", "email_address", @@ -2535,9 +2503,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.13" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9627da5196e5d8ed0b0495e61e518847578da83483c37288316d9b2e03a7f72" +checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" [[package]] name = "libredox" @@ -2591,9 +2559,9 @@ checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" [[package]] name = "litemap" -version = "0.7.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856" +checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" [[package]] name = "lock_api" @@ -3205,7 +3173,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.11", + "redox_syscall 0.5.12", "smallvec", "windows-targets 0.52.6", ] @@ -3378,6 +3346,15 @@ version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" +[[package]] +name = "potential_utf" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585" +dependencies = [ + "zerovec", +] + [[package]] name = "powerfmt" version = "0.2.0" @@ -3390,7 +3367,7 @@ version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" dependencies = [ - "zerocopy 0.8.25", + "zerocopy", ] [[package]] @@ -3617,9 +3594,9 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.11" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "541d0f57c6ec747a90738a52741d3221f7960e8ac2f0ff4b1a63680e033b4ab5" +checksum = "ee4e529991f949c5e25755532370b8af5d114acae52326361d68d47af64aa842" dependencies = [ "cfg_aliases", "libc", @@ -3734,9 +3711,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.11" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2f103c6d277498fbceb16e84d317e2a400f160f46904d5f5410848c829511a3" +checksum = "928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af" dependencies = [ "bitflags 2.9.0", ] @@ -3784,7 +3761,7 @@ version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8eff4fa778b5c2a57e85c5f2fe3a709c52f0e60d23146e2151cbef5893f420e" dependencies = [ - "ahash 0.8.11", + "ahash 0.8.12", "fluent-uri", "once_cell", "parking_lot", @@ -3911,7 +3888,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots", + "webpki-roots 0.26.11", "windows-registry", ] @@ -4030,9 +4007,9 @@ dependencies = [ [[package]] name = "rustix" -version = "1.0.5" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf" +checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266" dependencies = [ "bitflags 2.9.0", "errno", @@ -4043,16 +4020,16 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.26" +version = "0.23.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df51b5869f3a441595eac5e8ff14d486ff285f7b8c0df8770e49c3b56351f0f0" +checksum = "730944ca083c1c233a75c09f199e973ca499344a2b7ba9e755c457e86fb4a321" dependencies = [ "aws-lc-rs", "log", "once_cell", "ring", "rustls-pki-types", - "rustls-webpki 0.103.1", + "rustls-webpki 0.103.2", "subtle", "zeroize", ] @@ -4068,11 +4045,12 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c" +checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79" dependencies = [ "web-time", + "zeroize", ] [[package]] @@ -4088,9 +4066,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.103.1" +version = "0.103.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fef8b8769aaccf73098557a87cd1816b4f9c7c16811c9c77142aa695c16f2c03" +checksum = "7149975849f1abb3832b246010ef62ccc80d3a76169517ada7188252b9cfb437" dependencies = [ "aws-lc-rs", "ring", @@ -4354,9 +4332,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.8" +version = "0.10.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ "cfg-if", "cpufeatures", @@ -4693,9 +4671,9 @@ dependencies = [ [[package]] name = "synstructure" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", @@ -4733,7 +4711,7 @@ dependencies = [ "fastrand", "getrandom 0.3.2", "once_cell", - "rustix 1.0.5", + "rustix 1.0.7", "windows-sys 0.59.0", ] @@ -4743,7 +4721,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45c6481c4829e4cc63825e62c49186a34538b7b2750b73b266581ffb612fb5ed" dependencies = [ - "rustix 1.0.5", + "rustix 1.0.7", "windows-sys 0.59.0", ] @@ -4875,9 +4853,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.7.6" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b" dependencies = [ "displaydoc", "zerovec", @@ -4921,9 +4899,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.44.2" +version = "1.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48" +checksum = "2513ca694ef9ede0fb23fe71a4ee4107cb102b9dc1930f6d0fd77aae068ae165" dependencies = [ "backtrace", "bytes", @@ -5242,12 +5220,6 @@ dependencies = [ "log", ] -[[package]] -name = "utf16_iter" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" - [[package]] name = "utf8-decode" version = "1.0.1" @@ -5461,9 +5433,18 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.9" +version = "0.26.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29aad86cec885cafd03e8305fd727c418e970a521322c91688414d5b8efba16b" +checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9" +dependencies = [ + "webpki-roots 1.0.0", +] + +[[package]] +name = "webpki-roots" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2853738d1cc4f2da3a225c18ec6c3721abb31961096e9dbf5ab35fa88b19cfdb" dependencies = [ "rustls-pki-types", ] @@ -5488,7 +5469,7 @@ checksum = "24d643ce3fd3e5b54854602a080f34fb10ab75e0b813ee32d00ca2b44fa74762" dependencies = [ "either", "env_home", - "rustix 1.0.5", + "rustix 1.0.7", "winsafe", ] @@ -5882,9 +5863,9 @@ checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486" [[package]] name = "winnow" -version = "0.7.7" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cb8234a863ea0e8cd7284fcdd4f145233eb00fee02bbdd9861aec44e6477bc5" +checksum = "c06928c8748d81b05c9be96aad92e1b6ff01833332f281e8cfca3be4b35fc9ec" dependencies = [ "memchr", ] @@ -5910,17 +5891,11 @@ dependencies = [ "bitflags 2.9.0", ] -[[package]] -name = "write16" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" - [[package]] name = "writeable" -version = "0.5.5" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" +checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb" [[package]] name = "x509-cert" @@ -5958,9 +5933,9 @@ dependencies = [ [[package]] name = "yoke" -version = "0.7.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" +checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc" dependencies = [ "serde", "stable_deref_trait", @@ -5970,9 +5945,9 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" +checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6" dependencies = [ "proc-macro2", "quote", @@ -5980,33 +5955,13 @@ dependencies = [ "synstructure", ] -[[package]] -name = "zerocopy" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" -dependencies = [ - "zerocopy-derive 0.7.35", -] - [[package]] name = "zerocopy" version = "0.8.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb" dependencies = [ - "zerocopy-derive 0.8.25", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.101", + "zerocopy-derive", ] [[package]] @@ -6063,10 +6018,21 @@ dependencies = [ ] [[package]] -name = "zerovec" -version = "0.10.4" +name = "zerotrie" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + +[[package]] +name = "zerovec" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428" dependencies = [ "yoke", "zerofrom", @@ -6075,9 +6041,9 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.10.3" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f" dependencies = [ "proc-macro2", "quote", diff --git a/integration-tests/test-repo/recipes/common.yml b/integration-tests/test-repo/recipes/common.yml new file mode 100644 index 0000000..90c844e --- /dev/null +++ b/integration-tests/test-repo/recipes/common.yml @@ -0,0 +1,61 @@ +modules: + - from-file: akmods.yml + - from-file: flatpaks.yml + + - type: files + files: + - source: usr + destination: /usr + + - type: script + scripts: + - example.sh + + - type: dnf + repos: + files: + - https://copr.fedorainfracloud.org/coprs/atim/starship/repo/fedora-%OS_VERSION%/atim-starship-fedora-%OS_VERSION%.repo + install: + packages: + - micro + - starship + remove: + packages: + - firefox + - firefox-langpacks + + - type: signing + + - type: test-module + source: local + + - type: test-nu-modules + source: local + test-prop: + - this + - is + - a + - test + + - type: containerfile + containerfiles: + - labels + snippets: + - RUN echo "This is a snippet" && ostree container commit + + - type: copy + from: alpine-test + src: /test.txt + dest: / + - type: copy + from: ubuntu-test + src: /test.txt + dest: / + - type: copy + from: debian-test + src: /test.txt + dest: / + - type: copy + from: fedora-test + src: /test.txt + dest: / diff --git a/integration-tests/test-repo/recipes/recipe-arm64.yml b/integration-tests/test-repo/recipes/recipe-arm64.yml index fbde0ed..20f7d77 100644 --- a/integration-tests/test-repo/recipes/recipe-arm64.yml +++ b/integration-tests/test-repo/recipes/recipe-arm64.yml @@ -1,69 +1,10 @@ --- # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json -name: cli/test +name: cli/test-arm64 description: This is my personal OS image. base-image: quay.io/fedora/fedora-silverblue image-version: latest -alt-tags: - - arm64 stages: - from-file: stages.yml modules: - - from-file: flatpaks.yml - - - type: files - files: - - usr: /usr - - - type: script - scripts: - - example.sh - - - type: dnf - repos: - files: - - https://copr.fedorainfracloud.org/coprs/atim/starship/repo/fedora-%OS_VERSION%/atim-starship-fedora-%OS_VERSION%.repo - install: - packages: - - micro - - starship - remove: - packages: - - firefox - - firefox-langpacks - - - type: signing - - - type: test-module - source: local - - - type: test-nu-modules - source: local - test-prop: - - this - - is - - a - - test - - - type: containerfile - containerfiles: - - labels - snippets: - - RUN echo "This is a snippet" && ostree container commit - - - type: copy - from: alpine-test - src: /test.txt - dest: / - - type: copy - from: ubuntu-test - src: /test.txt - dest: / - - type: copy - from: debian-test - src: /test.txt - dest: / - - type: copy - from: fedora-test - src: /test.txt - dest: / + - from-file: common.yml diff --git a/integration-tests/test-repo/recipes/recipe-buildah.yml b/integration-tests/test-repo/recipes/recipe-buildah.yml new file mode 100644 index 0000000..41edf21 --- /dev/null +++ b/integration-tests/test-repo/recipes/recipe-buildah.yml @@ -0,0 +1,10 @@ +--- +# yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json +name: cli/test-buildah +description: This is my personal OS image. +base-image: ghcr.io/ublue-os/silverblue-main +image-version: latest +stages: + - from-file: stages.yml +modules: + - from-file: common.yml diff --git a/integration-tests/test-repo/recipes/recipe-docker-external.yml b/integration-tests/test-repo/recipes/recipe-docker-external.yml new file mode 100644 index 0000000..e9dc97a --- /dev/null +++ b/integration-tests/test-repo/recipes/recipe-docker-external.yml @@ -0,0 +1,10 @@ +--- +# yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json +name: cli/test-docker-external +description: This is my personal OS image. +base-image: ghcr.io/ublue-os/silverblue-main +image-version: latest +stages: + - from-file: stages.yml +modules: + - from-file: common.yml diff --git a/integration-tests/test-repo/recipes/recipe-podman.yml b/integration-tests/test-repo/recipes/recipe-podman.yml new file mode 100644 index 0000000..c759c37 --- /dev/null +++ b/integration-tests/test-repo/recipes/recipe-podman.yml @@ -0,0 +1,10 @@ +--- +# yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json +name: cli/test-podman +description: This is my personal OS image. +base-image: ghcr.io/ublue-os/silverblue-main +image-version: latest +stages: + - from-file: stages.yml +modules: + - from-file: common.yml diff --git a/integration-tests/test-repo/recipes/recipe-rechunk.yml b/integration-tests/test-repo/recipes/recipe-rechunk.yml index 8dd5555..1f43700 100644 --- a/integration-tests/test-repo/recipes/recipe-rechunk.yml +++ b/integration-tests/test-repo/recipes/recipe-rechunk.yml @@ -7,55 +7,4 @@ image-version: latest stages: - from-file: stages.yml modules: - - from-file: akmods.yml - - from-file: flatpaks.yml - - - type: files - files: - - source: usr - destination: /usr - - - type: script - scripts: - - example.sh - - - type: dnf - repos: - files: - - https://copr.fedorainfracloud.org/coprs/atim/starship/repo/fedora-%OS_VERSION%/atim-starship-fedora-%OS_VERSION%.repo - install: - packages: - - micro - - starship - remove: - packages: - - firefox - - firefox-langpacks - - - type: signing - - - type: test-module - source: local - - - type: containerfile - containerfiles: - - labels - snippets: - - RUN echo "This is a snippet" && ostree container commit - - - type: copy - from: alpine-test - src: /test.txt - dest: / - - type: copy - from: ubuntu-test - src: /test.txt - dest: / - - type: copy - from: debian-test - src: /test.txt - dest: / - - type: copy - from: fedora-test - src: /test.txt - dest: / + - from-file: common.yml diff --git a/integration-tests/test-repo/recipes/recipe.yml b/integration-tests/test-repo/recipes/recipe.yml index 458a0f9..5791556 100644 --- a/integration-tests/test-repo/recipes/recipe.yml +++ b/integration-tests/test-repo/recipes/recipe.yml @@ -7,63 +7,4 @@ image-version: latest stages: - from-file: stages.yml modules: - - from-file: akmods.yml - - from-file: flatpaks.yml - - - type: files - files: - - source: usr - destination: /usr - - - type: script - scripts: - - example.sh - - - type: dnf - repos: - files: - - https://copr.fedorainfracloud.org/coprs/atim/starship/repo/fedora-%OS_VERSION%/atim-starship-fedora-%OS_VERSION%.repo - install: - packages: - - micro - - starship - remove: - packages: - - firefox - - firefox-langpacks - - - type: signing - - - type: test-module - source: local - - - type: test-nu-modules - source: local - test-prop: - - this - - is - - a - - test - - - type: containerfile - containerfiles: - - labels - snippets: - - RUN echo "This is a snippet" && ostree container commit - - - type: copy - from: alpine-test - src: /test.txt - dest: / - - type: copy - from: ubuntu-test - src: /test.txt - dest: / - - type: copy - from: debian-test - src: /test.txt - dest: / - - type: copy - from: fedora-test - src: /test.txt - dest: / + - from-file: common.yml diff --git a/justfile b/justfile index 5663db1..e5bb1af 100644 --- a/justfile +++ b/justfile @@ -183,18 +183,7 @@ test-docker-build-external-login: install-debug-all-features -S sigstore \ {{ should_push }} \ -vv \ - recipes/recipe.yml recipes/recipe-gts.yml - -# Run docker driver oauth login integration test -test-docker-build-oauth-login: install-debug-all-features - cd integration-tests/test-repo \ - && bluebuild build \ - --registry us-east1-docker.pkg.dev \ - --registry-namespace bluebuild-oidc/bluebuild \ - --retry-push \ - {{ should_push }} \ - -vv \ - recipes/recipe.yml recipes/recipe-gts.yml + recipes/recipe-docker-external.yml # Run podman driver integration test test-podman-build: install-debug-all-features @@ -206,7 +195,7 @@ test-podman-build: install-debug-all-features -S sigstore \ {{ should_push }} \ -vv \ - recipes/recipe.yml recipes/recipe-gts.yml + recipes/recipe-podman.yml # Run buildah driver integration test test-buildah-build: install-debug-all-features @@ -218,7 +207,7 @@ test-buildah-build: install-debug-all-features -S sigstore \ {{ should_push }} \ -vv \ - recipes/recipe.yml recipes/recipe-gts.yml + recipes/recipe-buildah.yml # Run ISO generator for images test-generate-iso-image: install-debug-all-features diff --git a/process/drivers/docker_driver.rs b/process/drivers/docker_driver.rs index 3811efe..6aea40b 100644 --- a/process/drivers/docker_driver.rs +++ b/process/drivers/docker_driver.rs @@ -6,7 +6,7 @@ use std::{ }; use blue_build_utils::{ - constants::{BB_BUILDKIT_CACHE_GHA, BLUE_BUILD, DOCKER_HOST, GITHUB_ACTIONS}, + constants::{BLUE_BUILD, DOCKER_HOST, GITHUB_ACTIONS}, credentials::Credentials, semver::Version, string_vec, @@ -448,14 +448,6 @@ fn build_tag_push_cmd(opts: &BuildTagPushOpts<'_>, first_image: &str) -> Command ], "-f", &*opts.containerfile, - // https://github.com/moby/buildkit?tab=readme-ov-file#github-actions-cache-experimental - if env::var(BB_BUILDKIT_CACHE_GHA) - .map_or_else(|_| false, |e| e == "true") => [ - "--cache-from", - "type=gha", - "--cache-to", - "type=gha", - ], if let Some(cache_from) = opts.cache_from.as_ref() => [ "--cache-from", format!( diff --git a/src/commands/validate/yaml_span.rs b/src/commands/validate/yaml_span.rs index 5554fd1..d5daa86 100644 --- a/src/commands/validate/yaml_span.rs +++ b/src/commands/validate/yaml_span.rs @@ -297,25 +297,19 @@ mod test { use super::YamlSpan; - const RECIPE: &str = include_str!("../../../integration-tests/test-repo/recipes/recipe.yml"); - const RECIPE_INVALID: &str = - include_str!("../../../integration-tests/test-repo/recipes/recipe-invalid.yml"); - const RECIPE_INVALID_MODULE: &str = - include_str!("../../../integration-tests/test-repo/recipes/recipe-invalid-module.yml"); - const RECIPE_INVALID_STAGE: &str = - include_str!("../../../integration-tests/test-repo/recipes/recipe-invalid-stage.yml"); + const RECIPE: &str = include_str!("../../../test-files/recipes/recipe-pass.yml"); + const RECIPE_INVALID: &str = include_str!("../../../test-files/recipes/recipe-fail.yml"); #[rstest] #[case("test: value", "", (0, 1))] #[case("test: value", "/test", (6, 5))] #[case(RECIPE, "/description", (109, 29))] #[case(RECIPE, "/image-version", (199, 6))] - #[case(RECIPE, "/modules/4/install", (621, 36))] - #[case(RECIPE, "/modules/8/snippets", (979, 57))] - #[case(RECIPE_INVALID, "/image-version", (182, 11))] - #[case(RECIPE_INVALID_STAGE, "/stages/0/from", (262, 8))] - #[case(RECIPE_INVALID_MODULE, "/modules/7/containerfiles", (807, 8))] + #[case(RECIPE, "/modules/4/source", (761, 5))] + #[case(RECIPE, "/modules/8/from", (1067, 11))] + #[case(RECIPE_INVALID, "/image-version", (199, 6))] fn test_getspan(#[case] file: &str, #[case] path: &str, #[case] expected: (usize, usize)) { + dbg!(path, expected); let file = Arc::new(file.to_owned()); let location = Location::try_from(path).unwrap(); dbg!(&location); diff --git a/utils/src/constants.rs b/utils/src/constants.rs index 06e7a38..8ac7641 100644 --- a/utils/src/constants.rs +++ b/utils/src/constants.rs @@ -18,7 +18,6 @@ pub const BUILD_ID_LABEL: &str = "org.blue-build.build-id"; pub const IMAGE_VERSION_LABEL: &str = "org.opencontainers.image.version"; // BlueBuild vars -pub const BB_BUILDKIT_CACHE_GHA: &str = "BB_BUILDKIT_CACHE_GHA"; pub const BB_CACHE_LAYERS: &str = "BB_CACHE_LAYERS"; pub const BB_PASSWORD: &str = "BB_PASSWORD"; pub const BB_PRIVATE_KEY: &str = "BB_PRIVATE_KEY";