From 0b3ef728275f99be1ac1a09febdc37a971b7a96f Mon Sep 17 00:00:00 2001 From: Pedro Fontana Date: Mon, 13 Nov 2023 18:31:12 -0300 Subject: [PATCH 1/5] Update wasm-pack version --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c22dbf80e9..401f41ffe2 100644 --- a/Makefile +++ b/Makefile @@ -181,7 +181,7 @@ cargo-deps: cargo install --version 1.14.0 hyperfine cargo install --version 0.9.49 cargo-nextest cargo install --version 0.5.9 cargo-llvm-cov - cargo install --version 0.11.0 wasm-pack + cargo install --version 0.12.1 wasm-pack cairo1-run-deps: cd cairo1-run; make deps From 9a1e0e18d79461a55123727d89bb0b6413d329de Mon Sep 17 00:00:00 2001 From: Pedro Fontana Date: Mon, 13 Nov 2023 18:42:55 -0300 Subject: [PATCH 2/5] Update rust-toolchain for cairo 1 programs --- .github/workflows/cairo_1_programs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cairo_1_programs.yml b/.github/workflows/cairo_1_programs.yml index bd0a637f57..d8a4c1f3f4 100644 --- a/.github/workflows/cairo_1_programs.yml +++ b/.github/workflows/cairo_1_programs.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Install Rust toolchain - uses: dtolnay/rust-toolchain@1.69.0 + uses: dtolnay/rust-toolchain@1.70.0 - name: Set up Cargo cache uses: Swatinem/rust-cache@v2 - name: Checkout From 254ad077c0b0ad1432e12c55a6c3d9134d590330 Mon Sep 17 00:00:00 2001 From: Pedro Fontana Date: Mon, 13 Nov 2023 19:32:17 -0300 Subject: [PATCH 3/5] Update iai-callgrind-runner version --- .github/workflows/iai_main.yml | 2 +- .github/workflows/iai_pr.yml | 4 ++-- Makefile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/iai_main.yml b/.github/workflows/iai_main.yml index 73ea622296..a28f1c0fef 100644 --- a/.github/workflows/iai_main.yml +++ b/.github/workflows/iai_main.yml @@ -23,7 +23,7 @@ jobs: pip install -r requirements.txt sudo apt update sudo apt install -y valgrind - cargo install --version 0.3.1 iai-callgrind-runner + cargo install --version 0.8.0 iai-callgrind-runner - name: Run iai benchmarks run: make iai-benchmark-action diff --git a/.github/workflows/iai_pr.yml b/.github/workflows/iai_pr.yml index 7c296b3e1b..b7ff38639a 100644 --- a/.github/workflows/iai_pr.yml +++ b/.github/workflows/iai_pr.yml @@ -39,7 +39,7 @@ jobs: pip install -r requirements.txt sudo apt update sudo apt install -y valgrind - cargo install --version 0.3.1 iai-callgrind-runner + cargo install --version 0.8.0 iai-callgrind-runner - name: Run iai benchmarks if: ${{ steps.cache-iai-results.outputs.cache-hit != 'true' }} @@ -64,7 +64,7 @@ jobs: pip install -r requirements.txt sudo apt update sudo apt install -y valgrind - cargo install --version 0.3.1 iai-callgrind-runner + cargo install --version 0.8.0 iai-callgrind-runner - name: Restore cache for ${{ github.event.pull_request.base.sha }} uses: actions/cache/restore@v3 diff --git a/Makefile b/Makefile index 401f41ffe2..f8d7a99ce1 100644 --- a/Makefile +++ b/Makefile @@ -175,7 +175,7 @@ build-cairo-2-compiler: fi cargo-deps: - cargo install --version 0.3.1 iai-callgrind-runner + cargo install --version 0.8.0 iai-callgrind-runner cargo install --version 1.1.0 cargo-criterion cargo install --version 0.6.1 flamegraph cargo install --version 1.14.0 hyperfine From 206395fb70f25532771be78a071f49df55188dfe Mon Sep 17 00:00:00 2001 From: Pedro Fontana Date: Mon, 13 Nov 2023 19:45:30 -0300 Subject: [PATCH 4/5] Revert "Update iai-callgrind-runner version" This reverts commit 254ad077c0b0ad1432e12c55a6c3d9134d590330. --- .github/workflows/iai_main.yml | 2 +- .github/workflows/iai_pr.yml | 4 ++-- Makefile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/iai_main.yml b/.github/workflows/iai_main.yml index a28f1c0fef..73ea622296 100644 --- a/.github/workflows/iai_main.yml +++ b/.github/workflows/iai_main.yml @@ -23,7 +23,7 @@ jobs: pip install -r requirements.txt sudo apt update sudo apt install -y valgrind - cargo install --version 0.8.0 iai-callgrind-runner + cargo install --version 0.3.1 iai-callgrind-runner - name: Run iai benchmarks run: make iai-benchmark-action diff --git a/.github/workflows/iai_pr.yml b/.github/workflows/iai_pr.yml index b7ff38639a..7c296b3e1b 100644 --- a/.github/workflows/iai_pr.yml +++ b/.github/workflows/iai_pr.yml @@ -39,7 +39,7 @@ jobs: pip install -r requirements.txt sudo apt update sudo apt install -y valgrind - cargo install --version 0.8.0 iai-callgrind-runner + cargo install --version 0.3.1 iai-callgrind-runner - name: Run iai benchmarks if: ${{ steps.cache-iai-results.outputs.cache-hit != 'true' }} @@ -64,7 +64,7 @@ jobs: pip install -r requirements.txt sudo apt update sudo apt install -y valgrind - cargo install --version 0.8.0 iai-callgrind-runner + cargo install --version 0.3.1 iai-callgrind-runner - name: Restore cache for ${{ github.event.pull_request.base.sha }} uses: actions/cache/restore@v3 diff --git a/Makefile b/Makefile index f8d7a99ce1..401f41ffe2 100644 --- a/Makefile +++ b/Makefile @@ -175,7 +175,7 @@ build-cairo-2-compiler: fi cargo-deps: - cargo install --version 0.8.0 iai-callgrind-runner + cargo install --version 0.3.1 iai-callgrind-runner cargo install --version 1.1.0 cargo-criterion cargo install --version 0.6.1 flamegraph cargo install --version 1.14.0 hyperfine From ec657be7d0135f991066872e5ee302547d8b4036 Mon Sep 17 00:00:00 2001 From: Mario Rugiero Date: Tue, 14 Nov 2023 13:37:24 -0300 Subject: [PATCH 5/5] ci: move iai checkout to the top (#1481) --- .github/workflows/iai_main.yml | 4 ++-- .github/workflows/iai_pr.yml | 13 ++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/iai_main.yml b/.github/workflows/iai_main.yml index 73ea622296..e1217085ba 100644 --- a/.github/workflows/iai_main.yml +++ b/.github/workflows/iai_main.yml @@ -8,6 +8,8 @@ jobs: cache-iai-results: runs-on: ubuntu-22.04 steps: + - name: Checkout + uses: actions/checkout@v3 - name: Install Rust uses: dtolnay/rust-toolchain@1.70.0 - name: Set up cargo cache @@ -16,8 +18,6 @@ jobs: uses: actions/setup-python@v4 with: python-version: '3.9' - - name: Checkout - uses: actions/checkout@v3 - name: Install test dependencies run: | pip install -r requirements.txt diff --git a/.github/workflows/iai_pr.yml b/.github/workflows/iai_pr.yml index 7c296b3e1b..db446adeb9 100644 --- a/.github/workflows/iai_pr.yml +++ b/.github/workflows/iai_pr.yml @@ -8,6 +8,10 @@ jobs: fetch-iai-results: runs-on: ubuntu-22.04 steps: + - name: Checkout + uses: actions/checkout@v3 + with: + ref: ${{ github.event.pull_request.base.sha }} - name: Initialize IAI cache for ${{ github.event.pull_request.base.sha }} uses: actions/cache@v3 id: cache-iai-results @@ -28,11 +32,6 @@ jobs: uses: actions/setup-python@v4 with: python-version: '3.9' - - name: Checkout - if: ${{ steps.cache-iai-results.outputs.cache-hit != 'true' }} - uses: actions/checkout@v3 - with: - ref: ${{ github.event.pull_request.base.sha }} - name: Install test dependencies if: ${{ steps.cache-iai-results.outputs.cache-hit != 'true' }} run: | @@ -49,6 +48,8 @@ jobs: needs: fetch-iai-results runs-on: ubuntu-22.04 steps: + - name: Checkout + uses: actions/checkout@v3 - name: Install Rust uses: dtolnay/rust-toolchain@1.70.0 - name: Set up cargo cache @@ -57,8 +58,6 @@ jobs: uses: actions/setup-python@v4 with: python-version: '3.9' - - name: Checkout - uses: actions/checkout@v3 - name: Install test dependencies run: | pip install -r requirements.txt