From 1deb721e75f9a2e2496a4aeb3eaf58ba3a8a248c Mon Sep 17 00:00:00 2001 From: Adi Yakovian Date: Tue, 14 Jan 2025 14:42:48 +0200 Subject: [PATCH 1/2] ci(shorten papirus ci): use cargo cache when building docker images --- .github/workflows/papyrus_ci.yml | 1 + .github/workflows/papyrus_docker-publish.yml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.github/workflows/papyrus_ci.yml b/.github/workflows/papyrus_ci.yml index a343590cd3..889054af98 100644 --- a/.github/workflows/papyrus_ci.yml +++ b/.github/workflows/papyrus_ci.yml @@ -100,6 +100,7 @@ jobs: runs-on: starkware-ubuntu-latest-medium steps: - uses: actions/checkout@v4 + - uses: ./.github/actions/bootstrap - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - name: Build Papyrus utilites docker image diff --git a/.github/workflows/papyrus_docker-publish.yml b/.github/workflows/papyrus_docker-publish.yml index 936baa4bf6..1685c43a84 100644 --- a/.github/workflows/papyrus_docker-publish.yml +++ b/.github/workflows/papyrus_docker-publish.yml @@ -41,6 +41,8 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 + - uses: ./.github/actions/bootstrap + # Not required but recommended - enables build multi-platform images, export cache, etc # Also workaround for: https://github.com/docker/build-push-action/issues/461 # https://github.com/docker/setup-buildx-action From 270478444d7aa8623a942460a96cc0826c402d50 Mon Sep 17 00:00:00 2001 From: Adi Yakovian Date: Tue, 14 Jan 2025 21:29:15 +0200 Subject: [PATCH 2/2] test(ci): adding cache to papyrus docker build --- .github/actions/install_rust/action.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/actions/install_rust/action.yml b/.github/actions/install_rust/action.yml index 4d123f3992..760e2b8e56 100644 --- a/.github/actions/install_rust/action.yml +++ b/.github/actions/install_rust/action.yml @@ -11,7 +11,8 @@ runs: steps: - uses: moonrepo/setup-rust@v1 with: - cache-base: main(-v[0-9].*)? + cache-base: 3304/merge + cache-target: release inherit-toolchain: true bins: taplo-cli@0.9.3, cargo-machete # Install additional non-default toolchains (for rustfmt for example), NOP if input omitted.