Skip to content

Commit d793f3b

Browse files
committed
mkay
Signed-off-by: Pierre Fenoll <[email protected]>
1 parent 3dabdc4 commit d793f3b

File tree

3 files changed

+43
-20
lines changed

3 files changed

+43
-20
lines changed

recipes/[email protected]

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7891,7 +7891,7 @@ COPY --from=dep-l-cross-0.2.5-c3662eb6acbe11dc /tmp/clis-cross_0-2-5/release/dep
78917891
## COPY --from=dep-l-cross-0.2.5-c3662eb6acbe11dc /tmp/clis-cross_0-2-5/release/deps/*-c3662eb6acbe11dc* /"""
78927892

78937893

7894-
FROM rust-base AS dep-b-cross-0.2.5-7eaab2b4c0c84545
7894+
FROM rust-base AS dep-b-cross-0.2.5-cbcdb302cda04185
78957895
SHELL ["/bin/bash", "-eux", "-c"]
78967896
WORKDIR /tmp/clis-cross_0-2-5/release/deps
78977897
WORKDIR /home/runner/.cargo/git/checkouts/cross-f0189a1dc141e2d9/88f49ff
@@ -7960,8 +7960,8 @@ RUN \
79607960
--mount=from=out-6ca4b8940d08185a,dst=/tmp/clis-cross_0-2-5/release/deps/libeither-6ca4b8940d08185a.rlib,source=/libeither-6ca4b8940d08185a.rlib \
79617961
{ cat ./rustc-toolchain{,.toml} 2>/dev/null || true ; } && \
79627962
env CARGO="$(which cargo)" \
7963-
CARGO_BIN_NAME="cross" \
7964-
CARGO_CRATE_NAME="cross" \
7963+
CARGO_BIN_NAME="cross-util" \
7964+
CARGO_CRATE_NAME="cross_util" \
79657965
CARGO_MANIFEST_DIR="/home/runner/.cargo/git/checkouts/cross-f0189a1dc141e2d9/88f49ff" \
79667966
CARGO_MANIFEST_PATH="/home/runner/.cargo/git/checkouts/cross-f0189a1dc141e2d9/88f49ff/Cargo.toml" \
79677967
CARGO_PKG_AUTHORS= \
@@ -7981,13 +7981,13 @@ RUN \
79817981
CARGO_PRIMARY_PACKAGE="1" \
79827982
OUT_DIR="/tmp/clis-cross_0-2-5/release/build/cross-1b3fc8ab449d7263/out" \
79837983
CARGOGREEN=1 \
7984-
rustc '--crate-name' 'cross' '--edition' '2021' '--error-format' 'json' '--json' 'diagnostic-rendered-ansi,artifacts,future-incompat' '--crate-type' 'bin' '--emit' 'dep-info,link' '-C' 'opt-level=3' '-C' 'lto' '--cfg' 'feature="default"' '--check-cfg' 'cfg(docsrs,test)' '--check-cfg' 'cfg(feature, values("default", "dev", "walkdir"))' '-C' 'metadata=d076567087f75df3' '-C' 'extra-filename=-7eaab2b4c0c84545' '--out-dir' '/tmp/clis-cross_0-2-5/release/deps' '-C' 'strip=debuginfo' '-L' 'dependency=/tmp/clis-cross_0-2-5/release/deps' '--extern' 'atty=/tmp/clis-cross_0-2-5/release/deps/libatty-46a37855ac321950.rlib' '--extern' 'clap=/tmp/clis-cross_0-2-5/release/deps/libclap-a00c2e4a4bf9b818.rlib' '--extern' 'color_eyre=/tmp/clis-cross_0-2-5/release/deps/libcolor_eyre-65067761fa053a3e.rlib' '--extern' 'const_sha1=/tmp/clis-cross_0-2-5/release/deps/libconst_sha1-3c772534ad9fdf1f.rlib' '--extern' 'cross=/tmp/clis-cross_0-2-5/release/deps/libcross-c3662eb6acbe11dc.rlib' '--extern' 'ctrlc=/tmp/clis-cross_0-2-5/release/deps/libctrlc-48b3b86e4e4f2114.rlib' '--extern' 'directories=/tmp/clis-cross_0-2-5/release/deps/libdirectories-891fc36d35509035.rlib' '--extern' 'eyre=/tmp/clis-cross_0-2-5/release/deps/libeyre-5151311344fd3fb7.rlib' '--extern' 'home=/tmp/clis-cross_0-2-5/release/deps/libhome-28aa2770b728330c.rlib' '--extern' 'libc=/tmp/clis-cross_0-2-5/release/deps/liblibc-78d0c09fd98410d3.rlib' '--extern' 'nix=/tmp/clis-cross_0-2-5/release/deps/libnix-89f78fdfe008d9f4.rlib' '--extern' 'owo_colors=/tmp/clis-cross_0-2-5/release/deps/libowo_colors-eced7492e7bb52df.rlib' '--extern' 'rustc_version=/tmp/clis-cross_0-2-5/release/deps/librustc_version-182fc92bf017931f.rlib' '--extern' 'serde=/tmp/clis-cross_0-2-5/release/deps/libserde-10e6ae2a48a664bf.rlib' '--extern' 'serde_ignored=/tmp/clis-cross_0-2-5/release/deps/libserde_ignored-ad1c11aa20349f7e.rlib' '--extern' 'serde_json=/tmp/clis-cross_0-2-5/release/deps/libserde_json-78065967e2e77310.rlib' '--extern' 'shell_escape=/tmp/clis-cross_0-2-5/release/deps/libshell_escape-b768087242be0e38.rlib' '--extern' 'shell_words=/tmp/clis-cross_0-2-5/release/deps/libshell_words-c22b2d49b64cd2d4.rlib' '--extern' 'tempfile=/tmp/clis-cross_0-2-5/release/deps/libtempfile-b6bebaf66050da67.rlib' '--extern' 'thiserror=/tmp/clis-cross_0-2-5/release/deps/libthiserror-a83562971cd0b23f.rlib' '--extern' 'toml=/tmp/clis-cross_0-2-5/release/deps/libtoml-548caa2564372054.rlib' '--extern' 'which=/tmp/clis-cross_0-2-5/release/deps/libwhich-4251b3313cc89510.rlib' src/bin/cross.rs \
7984+
rustc '--crate-name' 'cross_util' '--edition' '2021' '--error-format' 'json' '--json' 'diagnostic-rendered-ansi,artifacts,future-incompat' '--crate-type' 'bin' '--emit' 'dep-info,link' '-C' 'opt-level=3' '-C' 'lto' '--cfg' 'feature="default"' '--check-cfg' 'cfg(docsrs,test)' '--check-cfg' 'cfg(feature, values("default", "dev", "walkdir"))' '-C' 'metadata=72cca5a1a18028f8' '-C' 'extra-filename=-cbcdb302cda04185' '--out-dir' '/tmp/clis-cross_0-2-5/release/deps' '-C' 'strip=debuginfo' '-L' 'dependency=/tmp/clis-cross_0-2-5/release/deps' '--extern' 'atty=/tmp/clis-cross_0-2-5/release/deps/libatty-46a37855ac321950.rlib' '--extern' 'clap=/tmp/clis-cross_0-2-5/release/deps/libclap-a00c2e4a4bf9b818.rlib' '--extern' 'color_eyre=/tmp/clis-cross_0-2-5/release/deps/libcolor_eyre-65067761fa053a3e.rlib' '--extern' 'const_sha1=/tmp/clis-cross_0-2-5/release/deps/libconst_sha1-3c772534ad9fdf1f.rlib' '--extern' 'cross=/tmp/clis-cross_0-2-5/release/deps/libcross-c3662eb6acbe11dc.rlib' '--extern' 'ctrlc=/tmp/clis-cross_0-2-5/release/deps/libctrlc-48b3b86e4e4f2114.rlib' '--extern' 'directories=/tmp/clis-cross_0-2-5/release/deps/libdirectories-891fc36d35509035.rlib' '--extern' 'eyre=/tmp/clis-cross_0-2-5/release/deps/libeyre-5151311344fd3fb7.rlib' '--extern' 'home=/tmp/clis-cross_0-2-5/release/deps/libhome-28aa2770b728330c.rlib' '--extern' 'libc=/tmp/clis-cross_0-2-5/release/deps/liblibc-78d0c09fd98410d3.rlib' '--extern' 'nix=/tmp/clis-cross_0-2-5/release/deps/libnix-89f78fdfe008d9f4.rlib' '--extern' 'owo_colors=/tmp/clis-cross_0-2-5/release/deps/libowo_colors-eced7492e7bb52df.rlib' '--extern' 'rustc_version=/tmp/clis-cross_0-2-5/release/deps/librustc_version-182fc92bf017931f.rlib' '--extern' 'serde=/tmp/clis-cross_0-2-5/release/deps/libserde-10e6ae2a48a664bf.rlib' '--extern' 'serde_ignored=/tmp/clis-cross_0-2-5/release/deps/libserde_ignored-ad1c11aa20349f7e.rlib' '--extern' 'serde_json=/tmp/clis-cross_0-2-5/release/deps/libserde_json-78065967e2e77310.rlib' '--extern' 'shell_escape=/tmp/clis-cross_0-2-5/release/deps/libshell_escape-b768087242be0e38.rlib' '--extern' 'shell_words=/tmp/clis-cross_0-2-5/release/deps/libshell_words-c22b2d49b64cd2d4.rlib' '--extern' 'tempfile=/tmp/clis-cross_0-2-5/release/deps/libtempfile-b6bebaf66050da67.rlib' '--extern' 'thiserror=/tmp/clis-cross_0-2-5/release/deps/libthiserror-a83562971cd0b23f.rlib' '--extern' 'toml=/tmp/clis-cross_0-2-5/release/deps/libtoml-548caa2564372054.rlib' '--extern' 'which=/tmp/clis-cross_0-2-5/release/deps/libwhich-4251b3313cc89510.rlib' src/bin/cross-util.rs \
79857985
1> >(sed 's/^/::STDOUT:: /') \
79867986
2> >(sed 's/^/::STDERR:: /' >&2)
7987-
FROM scratch AS out-7eaab2b4c0c84545
7988-
COPY --from=dep-b-cross-0.2.5-7eaab2b4c0c84545 /tmp/clis-cross_0-2-5/release/deps/*-7eaab2b4c0c84545* /
7987+
FROM scratch AS out-cbcdb302cda04185
7988+
COPY --from=dep-b-cross-0.2.5-cbcdb302cda04185 /tmp/clis-cross_0-2-5/release/deps/*-cbcdb302cda04185* /
79897989

7990-
## this = "7eaab2b4c0c84545"
7990+
## this = "cbcdb302cda04185"
79917991
## deps = [
79927992
## "46a37855ac321950",
79937993
## "78d0c09fd98410d3",
@@ -8113,12 +8113,12 @@ COPY --from=dep-b-cross-0.2.5-7eaab2b4c0c84545 /tmp/clis-cross_0-2-5/release/dep
81138113
## "either-6ca4b8940d08185a",
81148114
## ]
81158115
## writes = [
8116-
## "deps/cross-7eaab2b4c0c84545.d",
8117-
## "deps/cross-7eaab2b4c0c84545",
8116+
## "deps/cross_util-cbcdb302cda04185.d",
8117+
## "deps/cross_util-cbcdb302cda04185",
81188118
## ]
81198119
## stderr = [
8120-
## '{"$message_type":"artifact","artifact":"/tmp/clis-cross_0-2-5/release/deps/cross-7eaab2b4c0c84545.d","emit":"dep-info"}',
8121-
## '{"$message_type":"artifact","artifact":"/tmp/clis-cross_0-2-5/release/deps/cross-7eaab2b4c0c84545","emit":"link"}',
8120+
## '{"$message_type":"artifact","artifact":"/tmp/clis-cross_0-2-5/release/deps/cross_util-cbcdb302cda04185.d","emit":"dep-info"}',
8121+
## '{"$message_type":"artifact","artifact":"/tmp/clis-cross_0-2-5/release/deps/cross_util-cbcdb302cda04185","emit":"link"}',
81228122
## ]
81238123
##
81248124
## [[contexts]]
@@ -8141,9 +8141,9 @@ COPY --from=dep-b-cross-0.2.5-7eaab2b4c0c84545 /tmp/clis-cross_0-2-5/release/dep
81418141
## https://github.com/cross-rs/cross.git#88f49ff79e777bef6d3564531636ee4d3cc2f8d2 /'''
81428142
##
81438143
## [[stages]]
8144-
## name = "dep-b-cross-0.2.5-7eaab2b4c0c84545"
8144+
## name = "dep-b-cross-0.2.5-cbcdb302cda04185"
81458145
## script = '''
8146-
## FROM rust-base AS dep-b-cross-0.2.5-7eaab2b4c0c84545
8146+
## FROM rust-base AS dep-b-cross-0.2.5-cbcdb302cda04185
81478147
## SHELL ["/bin/bash", "-eux", "-c"]
81488148
## WORKDIR /tmp/clis-cross_0-2-5/release/deps
81498149
## WORKDIR /home/runner/.cargo/git/checkouts/cross-f0189a1dc141e2d9/88f49ff
@@ -8212,8 +8212,8 @@ COPY --from=dep-b-cross-0.2.5-7eaab2b4c0c84545 /tmp/clis-cross_0-2-5/release/dep
82128212
## --mount=from=out-6ca4b8940d08185a,dst=/tmp/clis-cross_0-2-5/release/deps/libeither-6ca4b8940d08185a.rlib,source=/libeither-6ca4b8940d08185a.rlib \
82138213
## { cat ./rustc-toolchain{,.toml} 2>/dev/null || true ; } && \
82148214
## env CARGO="$(which cargo)" \
8215-
## CARGO_BIN_NAME="cross" \
8216-
## CARGO_CRATE_NAME="cross" \
8215+
## CARGO_BIN_NAME="cross-util" \
8216+
## CARGO_CRATE_NAME="cross_util" \
82178217
## CARGO_MANIFEST_DIR="/home/runner/.cargo/git/checkouts/cross-f0189a1dc141e2d9/88f49ff" \
82188218
## CARGO_MANIFEST_PATH="/home/runner/.cargo/git/checkouts/cross-f0189a1dc141e2d9/88f49ff/Cargo.toml" \
82198219
## CARGO_PKG_AUTHORS= \
@@ -8233,16 +8233,16 @@ COPY --from=dep-b-cross-0.2.5-7eaab2b4c0c84545 /tmp/clis-cross_0-2-5/release/dep
82338233
## CARGO_PRIMARY_PACKAGE="1" \
82348234
## OUT_DIR="/tmp/clis-cross_0-2-5/release/build/cross-1b3fc8ab449d7263/out" \
82358235
## CARGOGREEN=1 \
8236-
## rustc '--crate-name' 'cross' '--edition' '2021' '--error-format' 'json' '--json' 'diagnostic-rendered-ansi,artifacts,future-incompat' '--crate-type' 'bin' '--emit' 'dep-info,link' '-C' 'opt-level=3' '-C' 'lto' '--cfg' 'feature="default"' '--check-cfg' 'cfg(docsrs,test)' '--check-cfg' 'cfg(feature, values("default", "dev", "walkdir"))' '-C' 'metadata=d076567087f75df3' '-C' 'extra-filename=-7eaab2b4c0c84545' '--out-dir' '/tmp/clis-cross_0-2-5/release/deps' '-C' 'strip=debuginfo' '-L' 'dependency=/tmp/clis-cross_0-2-5/release/deps' '--extern' 'atty=/tmp/clis-cross_0-2-5/release/deps/libatty-46a37855ac321950.rlib' '--extern' 'clap=/tmp/clis-cross_0-2-5/release/deps/libclap-a00c2e4a4bf9b818.rlib' '--extern' 'color_eyre=/tmp/clis-cross_0-2-5/release/deps/libcolor_eyre-65067761fa053a3e.rlib' '--extern' 'const_sha1=/tmp/clis-cross_0-2-5/release/deps/libconst_sha1-3c772534ad9fdf1f.rlib' '--extern' 'cross=/tmp/clis-cross_0-2-5/release/deps/libcross-c3662eb6acbe11dc.rlib' '--extern' 'ctrlc=/tmp/clis-cross_0-2-5/release/deps/libctrlc-48b3b86e4e4f2114.rlib' '--extern' 'directories=/tmp/clis-cross_0-2-5/release/deps/libdirectories-891fc36d35509035.rlib' '--extern' 'eyre=/tmp/clis-cross_0-2-5/release/deps/libeyre-5151311344fd3fb7.rlib' '--extern' 'home=/tmp/clis-cross_0-2-5/release/deps/libhome-28aa2770b728330c.rlib' '--extern' 'libc=/tmp/clis-cross_0-2-5/release/deps/liblibc-78d0c09fd98410d3.rlib' '--extern' 'nix=/tmp/clis-cross_0-2-5/release/deps/libnix-89f78fdfe008d9f4.rlib' '--extern' 'owo_colors=/tmp/clis-cross_0-2-5/release/deps/libowo_colors-eced7492e7bb52df.rlib' '--extern' 'rustc_version=/tmp/clis-cross_0-2-5/release/deps/librustc_version-182fc92bf017931f.rlib' '--extern' 'serde=/tmp/clis-cross_0-2-5/release/deps/libserde-10e6ae2a48a664bf.rlib' '--extern' 'serde_ignored=/tmp/clis-cross_0-2-5/release/deps/libserde_ignored-ad1c11aa20349f7e.rlib' '--extern' 'serde_json=/tmp/clis-cross_0-2-5/release/deps/libserde_json-78065967e2e77310.rlib' '--extern' 'shell_escape=/tmp/clis-cross_0-2-5/release/deps/libshell_escape-b768087242be0e38.rlib' '--extern' 'shell_words=/tmp/clis-cross_0-2-5/release/deps/libshell_words-c22b2d49b64cd2d4.rlib' '--extern' 'tempfile=/tmp/clis-cross_0-2-5/release/deps/libtempfile-b6bebaf66050da67.rlib' '--extern' 'thiserror=/tmp/clis-cross_0-2-5/release/deps/libthiserror-a83562971cd0b23f.rlib' '--extern' 'toml=/tmp/clis-cross_0-2-5/release/deps/libtoml-548caa2564372054.rlib' '--extern' 'which=/tmp/clis-cross_0-2-5/release/deps/libwhich-4251b3313cc89510.rlib' src/bin/cross.rs \
8236+
## rustc '--crate-name' 'cross_util' '--edition' '2021' '--error-format' 'json' '--json' 'diagnostic-rendered-ansi,artifacts,future-incompat' '--crate-type' 'bin' '--emit' 'dep-info,link' '-C' 'opt-level=3' '-C' 'lto' '--cfg' 'feature="default"' '--check-cfg' 'cfg(docsrs,test)' '--check-cfg' 'cfg(feature, values("default", "dev", "walkdir"))' '-C' 'metadata=72cca5a1a18028f8' '-C' 'extra-filename=-cbcdb302cda04185' '--out-dir' '/tmp/clis-cross_0-2-5/release/deps' '-C' 'strip=debuginfo' '-L' 'dependency=/tmp/clis-cross_0-2-5/release/deps' '--extern' 'atty=/tmp/clis-cross_0-2-5/release/deps/libatty-46a37855ac321950.rlib' '--extern' 'clap=/tmp/clis-cross_0-2-5/release/deps/libclap-a00c2e4a4bf9b818.rlib' '--extern' 'color_eyre=/tmp/clis-cross_0-2-5/release/deps/libcolor_eyre-65067761fa053a3e.rlib' '--extern' 'const_sha1=/tmp/clis-cross_0-2-5/release/deps/libconst_sha1-3c772534ad9fdf1f.rlib' '--extern' 'cross=/tmp/clis-cross_0-2-5/release/deps/libcross-c3662eb6acbe11dc.rlib' '--extern' 'ctrlc=/tmp/clis-cross_0-2-5/release/deps/libctrlc-48b3b86e4e4f2114.rlib' '--extern' 'directories=/tmp/clis-cross_0-2-5/release/deps/libdirectories-891fc36d35509035.rlib' '--extern' 'eyre=/tmp/clis-cross_0-2-5/release/deps/libeyre-5151311344fd3fb7.rlib' '--extern' 'home=/tmp/clis-cross_0-2-5/release/deps/libhome-28aa2770b728330c.rlib' '--extern' 'libc=/tmp/clis-cross_0-2-5/release/deps/liblibc-78d0c09fd98410d3.rlib' '--extern' 'nix=/tmp/clis-cross_0-2-5/release/deps/libnix-89f78fdfe008d9f4.rlib' '--extern' 'owo_colors=/tmp/clis-cross_0-2-5/release/deps/libowo_colors-eced7492e7bb52df.rlib' '--extern' 'rustc_version=/tmp/clis-cross_0-2-5/release/deps/librustc_version-182fc92bf017931f.rlib' '--extern' 'serde=/tmp/clis-cross_0-2-5/release/deps/libserde-10e6ae2a48a664bf.rlib' '--extern' 'serde_ignored=/tmp/clis-cross_0-2-5/release/deps/libserde_ignored-ad1c11aa20349f7e.rlib' '--extern' 'serde_json=/tmp/clis-cross_0-2-5/release/deps/libserde_json-78065967e2e77310.rlib' '--extern' 'shell_escape=/tmp/clis-cross_0-2-5/release/deps/libshell_escape-b768087242be0e38.rlib' '--extern' 'shell_words=/tmp/clis-cross_0-2-5/release/deps/libshell_words-c22b2d49b64cd2d4.rlib' '--extern' 'tempfile=/tmp/clis-cross_0-2-5/release/deps/libtempfile-b6bebaf66050da67.rlib' '--extern' 'thiserror=/tmp/clis-cross_0-2-5/release/deps/libthiserror-a83562971cd0b23f.rlib' '--extern' 'toml=/tmp/clis-cross_0-2-5/release/deps/libtoml-548caa2564372054.rlib' '--extern' 'which=/tmp/clis-cross_0-2-5/release/deps/libwhich-4251b3313cc89510.rlib' src/bin/cross-util.rs \
82378237
## 1> >(sed 's/^/::STDOUT:: /') \
82388238
## 2> >(sed 's/^/::STDERR:: /' >&2)'''
82398239
##
82408240
## [[stages]]
8241-
## name = "out-7eaab2b4c0c84545"
8241+
## name = "out-cbcdb302cda04185"
82428242
## script = """
8243-
## FROM scratch AS out-7eaab2b4c0c84545
8244-
## COPY --from=dep-b-cross-0.2.5-7eaab2b4c0c84545 /tmp/clis-cross_0-2-5/release/deps/*-7eaab2b4c0c84545* /"""
8243+
## FROM scratch AS out-cbcdb302cda04185
8244+
## COPY --from=dep-b-cross-0.2.5-cbcdb302cda04185 /tmp/clis-cross_0-2-5/release/deps/*-cbcdb302cda04185* /"""
82458245

82468246
# Pipe this file to (not portable due to usage of local build contexts):
82478247
# DOCKER_BUILDKIT="1" \
8248-
# docker --debug build --network=none --platform=local --pull=false --target=out-7eaab2b4c0c84545 --output=type=local,dest=/tmp/clis-cross_0-2-5/release/deps --build-context=crate_out-1b3fc8ab449d7263=/tmp/clis-cross_0-2-5/release/build/cross-1b3fc8ab449d7263/out --build-context=crate_out-5ab0a574da2deb41=/tmp/clis-cross_0-2-5/release/build/eyre-5ab0a574da2deb41/out -
8248+
# docker --debug build --network=none --platform=local --pull=false --target=out-cbcdb302cda04185 --output=type=local,dest=/tmp/clis-cross_0-2-5/release/deps --build-context=crate_out-1b3fc8ab449d7263=/tmp/clis-cross_0-2-5/release/build/cross-1b3fc8ab449d7263/out --build-context=crate_out-5ab0a574da2deb41=/tmp/clis-cross_0-2-5/release/build/eyre-5ab0a574da2deb41/out -

0 commit comments

Comments
 (0)