Skip to content

Commit fda1f4c

Browse files
authored
Merge branch 'main' into stavbe/air-private-input-fields-to-pub
2 parents 61a1c75 + 60c1fa0 commit fda1f4c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+407
-217
lines changed

.github/workflows/bench.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: benchmark
1+
name: benchmark
22

33
on:
44
push:
@@ -12,13 +12,13 @@ permissions:
1212

1313
jobs:
1414
build:
15-
runs-on: ubuntu-20.04
15+
runs-on: ubuntu-24.04
1616
steps:
1717
- name: Install Rust
18-
uses: dtolnay/rust-toolchain@1.81.0
18+
uses: dtolnay/rust-toolchain@1.85.0
1919
with:
2020
components: rustfmt, clippy
21-
- uses: actions/checkout@v3
21+
- uses: actions/checkout@v4
2222
- name: Python3 Build
2323
uses: actions/setup-python@v4
2424
with:

.github/workflows/cairo_1_programs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ on:
99
jobs:
1010
run:
1111
name: Execute programs
12-
runs-on: ubuntu-22.04
12+
runs-on: ubuntu-24.04
1313
steps:
1414
- name: Install Rust toolchain
15-
uses: dtolnay/rust-toolchain@1.81.0
15+
uses: dtolnay/rust-toolchain@1.85.0
1616
- name: Set up Cargo cache
1717
uses: Swatinem/rust-cache@v2
1818
- name: Checkout
19-
uses: actions/checkout@v3
19+
uses: actions/checkout@v4
2020
- name: install corelib
2121
run: cd cairo1-run/ && make deps
2222
- name: Run tests

.github/workflows/fresh_run.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
deps_suffix: ''
1919
os_name: ubuntu-22.04
2020
- os: macos-latest
21-
deps_suffix: '-macos'
21+
deps_suffix: '-macos'
2222
os_name: macos
2323
runs-on: ${{ matrix.os_name }}
2424
name: "Make deps, build & test on fresh ${{ matrix.os_name }} system"
@@ -35,10 +35,10 @@ jobs:
3535
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
3636
3737
- name: Checkout
38-
uses: actions/checkout@v3
38+
uses: actions/checkout@v4
3939

4040
- name: Install Rust
41-
uses: dtolnay/rust-toolchain@1.81.0
41+
uses: dtolnay/rust-toolchain@1.85.0
4242

4343
- name: Install Pyenv
4444
uses: "gabrielfalcao/pyenv-action@v13"
@@ -68,7 +68,7 @@ jobs:
6868
FAILED_TARGET=deps${{ matrix.deps_suffix }}
6969
elif [ ${{ steps.build.outcome }} = failure ]; then
7070
FAILED_TARGET=build
71-
else
71+
else
7272
FAILED_TARGET=test
7373
fi
7474
echo "FAILED_TARGET=$FAILED_TARGET" >> $GITHUB_ENV

.github/workflows/fuzzer.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
steps:
1010

1111
- name: Checkout
12-
uses: actions/checkout@v3
12+
uses: actions/checkout@v4
1313
with:
1414
ref: ${{ github.head_ref }}
1515

@@ -22,7 +22,7 @@ jobs:
2222
path: fuzzer/hfuzz_workspace/fuzz_json/input
2323
key: ${{ runner.os }}-inputs
2424

25-
25+
2626
- name: Install dependencies
2727
run: |
2828
sudo apt-get update
@@ -38,12 +38,12 @@ jobs:
3838
run: cargo install honggfuzz
3939

4040
# If has cached inputs starts with them or else starts from 0
41-
- name: Initializing fuzzer with previous inputs
41+
- name: Initializing fuzzer with previous inputs
4242
run: |
4343
cd fuzzer
4444
HFUZZ_RUN_ARGS="--dict=json.dict --run_time 10800 --timeout 60" cargo hfuzz run fuzz_json
4545
46-
# run the fuzzer with minimize to reduce inputs
46+
# run the fuzzer with minimize to reduce inputs
4747
- name: Initializing fuzzer with minimize
4848
run: |
4949
cd fuzzer
@@ -55,20 +55,20 @@ jobs:
5555
file_pattern: '*/hfuzz_workspace/fuzzer/fuzz_json/HONGGFUZZ* */hfuzz_workspace/fuzzer/fuzz_json/*.fuzz'
5656

5757
# Checkout current and last commit for the diff
58-
- name: Checkout commits
59-
uses: actions/checkout@v3
58+
- name: Checkout commits
59+
uses: actions/checkout@v4
6060
with:
6161
fetch-depth: 2
6262

6363
# Check if any new crashes were added
6464
- name: Check diff
6565
id: check_file_changed
66-
run: echo "report=$(git diff --name-only HEAD^ HEAD -- fuzzer/hfuzz_workspace/fuzz_json/*.fuzz)" >> $GITHUB_OUTPUT
66+
run: echo "report=$(git diff --name-only HEAD^ HEAD -- fuzzer/hfuzz_workspace/fuzz_json/*.fuzz)" >> $GITHUB_OUTPUT
6767

6868
# If a new crash was found, create an issue
69-
- name: Create issue
69+
- name: Create issue
7070
uses: JasonEtco/create-an-issue@v2
71-
if: ${{ steps.check_file_changed.outputs.report != '' }}
71+
if: ${{ steps.check_file_changed.outputs.report != '' }}
7272
env:
7373
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7474
CRASH_REPORT: ${{ steps.check_file_changed.outputs.report }}

.github/workflows/hint_accountant.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,22 @@ env:
99

1010
jobs:
1111
run:
12-
runs-on: ubuntu-22.04
12+
runs-on: ubuntu-24.04
1313
steps:
1414
- name: Install Rust toolchain
15-
uses: dtolnay/rust-toolchain@1.81.0
15+
uses: dtolnay/rust-toolchain@1.85.0
1616
- name: Set up Cargo cache
1717
uses: Swatinem/rust-cache@v2
1818
- name: Checkout
19-
uses: actions/checkout@v3
19+
uses: actions/checkout@v4
2020
- name: Check Build
2121
run: cargo build -p hint_accountant
2222
- name: Clone cairo-lang repo
2323
run: git clone --depth=1 https://github.com/starkware-libs/cairo-lang
2424
- name: Run the hint accounting script
2525
run: cargo r -p hint_accountant | tee comment.md
2626
- name: Update comment in tracking issue
27-
uses: peter-evans/create-or-update-comment@v3
27+
uses: peter-evans/create-or-update-comment@v4
2828
with:
2929
issue-number: 1031
3030
comment-id: 1518234161

.github/workflows/hyper_threading_benchmarks.yml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
name: Benchmark Hyper Threading
22

3+
permissions:
4+
# permission to write a bench comment
5+
issues: write
6+
# permission to write a bench comment
7+
pull-requests: write
8+
39
on:
410
pull_request:
511
branches:
@@ -10,9 +16,7 @@ jobs:
1016
runs-on: ubuntu-latest
1117
steps:
1218
- name: Checkout PR
13-
uses: actions/checkout@v2
14-
with:
15-
ref: ${{ github.head_ref }}
19+
uses: actions/checkout@v4
1620

1721
- name: Setup Python
1822
uses: actions/setup-python@v4
@@ -26,7 +30,7 @@ jobs:
2630
sudo apt-get install -y hyperfine
2731
2832
- name: Install Rust
29-
uses: dtolnay/rust-toolchain@1.81.0
33+
uses: dtolnay/rust-toolchain@1.85.0
3034
with:
3135
components: rustfmt, clippy
3236

@@ -35,7 +39,7 @@ jobs:
3539
cargo build --release -p hyper_threading
3640
cp target/release/hyper_threading ${{ github.workspace }}/hyper_threading_pr
3741
cp ./examples/hyper_threading/hyper-threading-workflow.sh ${{ github.workspace }}/hyper-threading-workflow.sh
38-
42+
3943
- name: Upload PR Binary
4044
uses: actions/upload-artifact@v4
4145
with:
@@ -50,7 +54,7 @@ jobs:
5054

5155

5256
- name: Checkout Main Branch
53-
uses: actions/checkout@v2
57+
uses: actions/checkout@v4
5458
with:
5559
ref: 'main'
5660

@@ -71,7 +75,7 @@ jobs:
7175
name: hyper_threading_workflow_script
7276
path: ${{ github.workspace }}/
7377

74-
- name: Compile programs
78+
- name: Compile programs
7579
run: make cairo_bench_programs
7680

7781
- name: Run Benchmarks

.github/workflows/hyperfine.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@ jobs:
1717
matrix:
1818
branch: [ base, head ]
1919
name: Build Cairo programs for ${{ matrix.branch }}
20-
runs-on: ubuntu-22.04
20+
runs-on: ubuntu-24.04
2121
outputs:
2222
benchmark-hashes-base: ${{ steps.export-hashes.outputs.benchmark-hashes-base }}
2323
benchmark-hashes-head: ${{ steps.export-hashes.outputs.benchmark-hashes-head }}
2424
steps:
2525
- name: Checkout base commit
26-
uses: actions/checkout@v3
26+
uses: actions/checkout@v4
2727
with:
2828
ref: ${{ github.event.pull_request[matrix.branch].sha }}
2929

3030
- name: Fetch from cache
31-
uses: actions/cache@v3
31+
uses: actions/cache@v4
3232
id: cache
3333
with:
3434
path: ${{ matrix.branch }}_programs/*.json
@@ -63,22 +63,22 @@ jobs:
6363
matrix:
6464
branch: [ base, head ]
6565
name: Build cairo-vm-cli for ${{ matrix.branch }}
66-
runs-on: ubuntu-22.04
66+
runs-on: ubuntu-24.04
6767
steps:
6868
- name: Populate cache
69-
uses: actions/cache@v3
69+
uses: actions/cache@v4
7070
id: cache
7171
with:
7272
path: bin/cairo-vm-cli-${{ matrix.branch }}
7373
key: binary-${{ github.event.pull_request[matrix.branch].sha }}
7474

7575
- name: Install Rust
7676
if: ${{ steps.cache.outputs.cache-hit != 'true' }}
77-
uses: dtolnay/rust-toolchain@1.81.0
77+
uses: dtolnay/rust-toolchain@1.85.0
7878

7979
- name: Checkout
8080
if: ${{ steps.cache.outputs.cache-hit != 'true' }}
81-
uses: actions/checkout@v3
81+
uses: actions/checkout@v4
8282
with:
8383
ref: ${{ github.event.pull_request[matrix.branch].sha }}
8484

@@ -100,33 +100,33 @@ jobs:
100100
program_state: [ modified, unmodified ]
101101
name: Run benchmarks for ${{ matrix.program_state }} programs
102102
needs: [ build-programs, build-binaries ]
103-
runs-on: ubuntu-22.04
103+
runs-on: ubuntu-24.04
104104
steps:
105105
- name: Install Hyperfine
106106
uses: taiki-e/install-action@v2
107107
with:
108-
tool: hyperfine@1.16
108+
tool: hyperfine@1.19
109109

110110
- name: Fetch base binary
111-
uses: actions/cache/restore@v3
111+
uses: actions/cache/restore@v4
112112
with:
113113
path: bin/cairo-vm-cli-base
114114
key: binary-${{ github.event.pull_request.base.sha }}
115115

116116
- name: Fetch HEAD binary
117-
uses: actions/cache/restore@v3
117+
uses: actions/cache/restore@v4
118118
with:
119119
path: bin/cairo-vm-cli-head
120120
key: binary-${{ github.event.pull_request.head.sha }}
121121

122122
- name: Fetch base programs
123-
uses: actions/cache/restore@v3
123+
uses: actions/cache/restore@v4
124124
with:
125125
path: base_programs/*.json
126126
key: benchmarks-base-${{ needs.build-programs.outputs.benchmark-hashes-base }}
127127

128128
- name: Fetch head programs
129-
uses: actions/cache/restore@v3
129+
uses: actions/cache/restore@v4
130130
with:
131131
path: head_programs/*.json
132132
key: benchmarks-head-${{ needs.build-programs.outputs.benchmark-hashes-head }}
@@ -175,7 +175,7 @@ jobs:
175175
176176
- name: Find comment
177177
if: ${{ steps.run-benchmarks.outputs.benchmark_count != 0 }}
178-
uses: peter-evans/find-comment@v2
178+
uses: peter-evans/find-comment@v3
179179
id: fc
180180
with:
181181
issue-number: ${{ github.event.pull_request.number }}
@@ -184,14 +184,14 @@ jobs:
184184

185185
- name: Create comment
186186
if: steps.fc.outputs.comment-id == '' && steps.run-benchmarks.outputs.benchmark_count != 0
187-
uses: peter-evans/create-or-update-comment@v3
187+
uses: peter-evans/create-or-update-comment@v4
188188
with:
189189
issue-number: ${{ github.event.pull_request.number }}
190190
body-path: comment_body.md
191191

192192
- name: Update comment
193193
if: steps.fc.outputs.comment-id != '' && steps.run-benchmarks.outputs.benchmark_count != 0
194-
uses: peter-evans/create-or-update-comment@v3
194+
uses: peter-evans/create-or-update-comment@v4
195195
with:
196196
comment-id: ${{ steps.fc.outputs.comment-id }}
197197
body-path: comment_body.md

.github/workflows/iai_main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ on:
66

77
jobs:
88
cache-iai-results:
9-
runs-on: ubuntu-22.04
9+
runs-on: ubuntu-24.04
1010
steps:
1111
- name: Checkout
12-
uses: actions/checkout@v3
12+
uses: actions/checkout@v4
1313
- name: Install Rust
14-
uses: dtolnay/rust-toolchain@1.81.0
14+
uses: dtolnay/rust-toolchain@1.85.0
1515
- name: Set up cargo cache
1616
uses: Swatinem/rust-cache@v2
1717
- name: Python3 Build

.github/workflows/iai_pr.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ on:
66

77
jobs:
88
fetch-iai-results:
9-
runs-on: ubuntu-22.04
9+
runs-on: ubuntu-24.04
1010
steps:
1111
- name: Checkout
12-
uses: actions/checkout@v3
12+
uses: actions/checkout@v4
1313
with:
1414
ref: ${{ github.event.pull_request.base.sha }}
1515
- name: Initialize IAI cache for ${{ github.event.pull_request.base.sha }}
@@ -23,7 +23,7 @@ jobs:
2323

2424
- name: Install Rust
2525
if: ${{ steps.cache-iai-results.outputs.cache-hit != 'true' }}
26-
uses: dtolnay/rust-toolchain@1.81.0
26+
uses: dtolnay/rust-toolchain@1.85.0
2727
- name: Set up cargo cache
2828
if: ${{ steps.cache-iai-results.outputs.cache-hit != 'true' }}
2929
uses: Swatinem/rust-cache@v2
@@ -46,12 +46,12 @@ jobs:
4646

4747
run-iai-benchmark:
4848
needs: fetch-iai-results
49-
runs-on: ubuntu-22.04
49+
runs-on: ubuntu-24.04
5050
steps:
5151
- name: Checkout
52-
uses: actions/checkout@v3
52+
uses: actions/checkout@v4
5353
- name: Install Rust
54-
uses: dtolnay/rust-toolchain@1.81.0
54+
uses: dtolnay/rust-toolchain@1.85.0
5555
- name: Set up cargo cache
5656
uses: Swatinem/rust-cache@v2
5757
- name: Python3 Build

0 commit comments

Comments
 (0)