From 691d77e5f8c713285a7f9a66e6694951352b51d7 Mon Sep 17 00:00:00 2001 From: "@defstream" Date: Wed, 10 Jan 2024 16:57:42 -0800 Subject: [PATCH] Update ".circleci/config.yml", "Earthfile", and Dockerfiles to use the latest version of the "kickable/builder" image with SHA256 hash "0ca05e7f4682f9bf7effddc4f998710a8b11a57df9b40ec861ff57e878f6b122". --- .circleci/config.yml | 2 +- Cargo.lock | 16 ++++++++-------- Earthfile | 9 ++++++--- docker/Dockerfile | 3 ++- docker/Dockerfile.aarch64-apple-darwin | 3 ++- docker/Dockerfile.aarch64-unknown-linux-gnu | 3 ++- docker/Dockerfile.cross | 3 ++- docker/Dockerfile.x86_64-apple-darwin | 3 ++- docker/Dockerfile.x86_64-pc-windows-gnu | 3 ++- docker/Dockerfile.x86_64-unknown-linux-musl | 3 ++- 10 files changed, 29 insertions(+), 19 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 35e6896..4565a1f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ jobs: resource_class: arm.medium steps: - checkout - - run: "sudo /bin/sh -c 'wget https://github.com/earthly/earthly/releases/download/v0.7.2/earthly-linux-arm64 -O /usr/local/bin/earthly && chmod +x /usr/local/bin/earthly'" + - run: "sudo /bin/sh -c 'wget https://github.com/earthly/earthly/releases/download/v0.7.23/earthly-linux-arm64 -O /usr/local/bin/earthly && chmod +x /usr/local/bin/earthly'" - run: command: FORCE_COLOR=1 earthly --ci --no-output +archive no_output_timeout: 2h diff --git a/Cargo.lock b/Cargo.lock index 041c182..e859948 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1446,9 +1446,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.22" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" +checksum = "b553656127a00601c8ae5590fcfdc118e4083a7924b6cf4ffc1ea4b99dc429d7" dependencies = [ "bytes", "fnv", @@ -1635,7 +1635,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2 0.3.22", + "h2 0.3.23", "http 0.2.11", "http-body 0.4.6", "httparse", @@ -3205,9 +3205,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] @@ -3487,7 +3487,7 @@ dependencies = [ "axum 0.6.20", "base64 0.21.6", "bytes", - "h2 0.3.22", + "h2 0.3.23", "http 0.2.11", "http-body 0.4.6", "hyper 0.14.28", @@ -4297,9 +4297,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.33" +version = "0.5.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7520bbdec7211caa7c4e682eb1fbe07abe20cee6756b6e00f537c82c11816aa" +checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" dependencies = [ "memchr", ] diff --git a/Earthfile b/Earthfile index 72b03f8..de5acea 100644 --- a/Earthfile +++ b/Earthfile @@ -17,7 +17,8 @@ benchmark: source: ARG PACKAGE_NAME - FROM kickable/builder:latest@sha256:e8fef4deb105463f173df482a61f096ac9c332f79d5996043be3e5158302c607 + FROM kickable/builder:latest@sha256:0ca05e7f4682f9bf7effddc4f998710a8b11a57df9b40ec861ff57e878f6b122 + WORKDIR /usr/src/${PACKAGE_NAME} COPY --dir i18n scripts examples proto src . COPY kickable.yaml Cargo.lock Cargo.toml Makefile build.rs README.md CHANGELOG.md LICENSE.md . @@ -265,7 +266,8 @@ x86-64-pc-windows-gnu: SAVE ARTIFACT ${BIN_NAME}.yaml ./${BIN_NAME}.yaml archive: - FROM --platform linux/arm64 kickable/builder:latest@sha256:e8fef4deb105463f173df482a61f096ac9c332f79d5996043be3e5158302c607 + FROM --platform linux/arm64 kickable/builder:latest@sha256:0ca05e7f4682f9bf7effddc4f998710a8b11a57df9b40ec861ff57e878f6b122 + WORKDIR /usr/src/archive/aarch64-apple-darwin COPY +aarch64-apple-darwin/* . @@ -308,7 +310,8 @@ archive: SAVE ARTIFACT x86_64-pc-windows-gnu.zip.sha256 AS LOCAL ./${DIST_DIR}/${PACKAGE_NAME}_${VERSION}_x86_64-pc-windows-gnu.zip.sha256 cross: - FROM kickable/builder:latest@sha256:e8fef4deb105463f173df482a61f096ac9c332f79d5996043be3e5158302c607 + FROM kickable/builder:latest@sha256:0ca05e7f4682f9bf7effddc4f998710a8b11a57df9b40ec861ff57e878f6b122 + WORKDIR /usr/src/kickable COPY src src COPY proto proto diff --git a/docker/Dockerfile b/docker/Dockerfile index 2e39a99..10f4523 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,7 +1,8 @@ ARG version=0.0.0 # setup build image + dependencies -FROM kickable/builder:latest@sha256:e8fef4deb105463f173df482a61f096ac9c332f79d5996043be3e5158302c607 AS build +FROM kickable/builder:latest@sha256:0ca05e7f4682f9bf7effddc4f998710a8b11a57df9b40ec861ff57e878f6b122 as build + ARG version WORKDIR /usr/src/kickable COPY src src diff --git a/docker/Dockerfile.aarch64-apple-darwin b/docker/Dockerfile.aarch64-apple-darwin index 4df86a4..98b8157 100644 --- a/docker/Dockerfile.aarch64-apple-darwin +++ b/docker/Dockerfile.aarch64-apple-darwin @@ -1,6 +1,7 @@ ARG version=0.0.0 # setup build image + dependencies -FROM kickable/builder:latest@sha256:e8fef4deb105463f173df482a61f096ac9c332f79d5996043be3e5158302c607 AS build +FROM kickable/builder:latest@sha256:0ca05e7f4682f9bf7effddc4f998710a8b11a57df9b40ec861ff57e878f6b122 + ARG version WORKDIR /usr/src/kickable COPY src src diff --git a/docker/Dockerfile.aarch64-unknown-linux-gnu b/docker/Dockerfile.aarch64-unknown-linux-gnu index 8bbc5a2..10e1f25 100644 --- a/docker/Dockerfile.aarch64-unknown-linux-gnu +++ b/docker/Dockerfile.aarch64-unknown-linux-gnu @@ -1,6 +1,7 @@ ARG version=0.0.0 # setup build image + dependencies -FROM kickable/builder:latest@sha256:e8fef4deb105463f173df482a61f096ac9c332f79d5996043be3e5158302c607 AS build +FROM kickable/builder:latest@sha256:0ca05e7f4682f9bf7effddc4f998710a8b11a57df9b40ec861ff57e878f6b122 + ARG version WORKDIR /usr/src/kickable COPY src src diff --git a/docker/Dockerfile.cross b/docker/Dockerfile.cross index ba10e6f..14e6a52 100644 --- a/docker/Dockerfile.cross +++ b/docker/Dockerfile.cross @@ -2,7 +2,8 @@ ARG version=0.0.0 ARG BIN_NAME=kickable # setup build image + dependencies -FROM kickable/builder:latest@sha256:e8fef4deb105463f173df482a61f096ac9c332f79d5996043be3e5158302c607 AS build +FROM kickable/builder:latest@sha256:0ca05e7f4682f9bf7effddc4f998710a8b11a57df9b40ec861ff57e878f6b122 + ARG version WORKDIR /usr/src/kickable COPY src src diff --git a/docker/Dockerfile.x86_64-apple-darwin b/docker/Dockerfile.x86_64-apple-darwin index c577c8d..445bb5f 100644 --- a/docker/Dockerfile.x86_64-apple-darwin +++ b/docker/Dockerfile.x86_64-apple-darwin @@ -1,6 +1,7 @@ ARG version=0.0.0 # setup build image + dependencies -FROM kickable/builder:latest@sha256:e8fef4deb105463f173df482a61f096ac9c332f79d5996043be3e5158302c607 AS build +FROM kickable/builder:latest@sha256:0ca05e7f4682f9bf7effddc4f998710a8b11a57df9b40ec861ff57e878f6b122 + ARG version WORKDIR /usr/src/kickable COPY src src diff --git a/docker/Dockerfile.x86_64-pc-windows-gnu b/docker/Dockerfile.x86_64-pc-windows-gnu index df851a5..632e415 100644 --- a/docker/Dockerfile.x86_64-pc-windows-gnu +++ b/docker/Dockerfile.x86_64-pc-windows-gnu @@ -1,6 +1,7 @@ ARG version=0.0.0 # setup build image + dependencies -FROM kickable/builder:latest@sha256:e8fef4deb105463f173df482a61f096ac9c332f79d5996043be3e5158302c607 AS build +FROM kickable/builder:latest@sha256:0ca05e7f4682f9bf7effddc4f998710a8b11a57df9b40ec861ff57e878f6b122 + ARG version WORKDIR /usr/src/kickable COPY src src diff --git a/docker/Dockerfile.x86_64-unknown-linux-musl b/docker/Dockerfile.x86_64-unknown-linux-musl index 6b6bef1..49e39d1 100644 --- a/docker/Dockerfile.x86_64-unknown-linux-musl +++ b/docker/Dockerfile.x86_64-unknown-linux-musl @@ -1,6 +1,7 @@ ARG version=0.0.0 # setup build image + dependencies -FROM kickable/builder:latest@sha256:e8fef4deb105463f173df482a61f096ac9c332f79d5996043be3e5158302c607 AS build +FROM kickable/builder:latest@sha256:0ca05e7f4682f9bf7effddc4f998710a8b11a57df9b40ec861ff57e878f6b122 + ARG version WORKDIR /usr/src/kickable COPY src src