Skip to content

Commit d93c4f8

Browse files
fix(ci): allow service CLI access to cairo-compile
Signed-off-by: Dori Medini <dori@starkware.co>
1 parent 28ec973 commit d93c4f8

2 files changed

Lines changed: 29 additions & 2 deletions

File tree

.github/workflows/committer_and_os_cli_push.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
run: echo "SHORT_HASH=${COMMIT_SHA:0:7}" >> $GITHUB_ENV
6666

6767
- name: Build CLI binary
68-
run: ./build_native_in_docker.sh rustup toolchain install && cargo build -p starknet_committer_and_os_cli -r --bin starknet_committer_and_os_cli --target-dir CLI_TARGET
68+
run: ./build_native_in_docker.sh cargo build -p starknet_committer_and_os_cli -r --bin starknet_committer_and_os_cli
6969

7070
- id: auth
7171
uses: "google-github-actions/auth@v2"
@@ -76,5 +76,5 @@ jobs:
7676
id: upload_file
7777
uses: "google-github-actions/upload-cloud-storage@v2"
7878
with:
79-
path: "CLI_TARGET/release/starknet_committer_and_os_cli"
79+
path: "release/starknet_committer_and_os_cli"
8080
destination: "committer-products-external/${{ env.SHORT_HASH }}/release/"

.github/workflows/committer_ci.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,19 @@ jobs:
3535
runs-on: starkware-ubuntu-24.04-medium
3636
if: ${{ github.event_name == 'pull_request' }}
3737
steps:
38+
# Setup pypy and link to the location expected by .cargo/config.toml.
39+
- uses: actions/setup-python@v5
40+
id: setup-pypy
41+
with:
42+
python-version: "pypy3.9"
43+
cache: 'pip'
44+
- run: ln -s '${{ steps.setup-pypy.outputs.python-path }}' /usr/local/bin/pypy3.9
45+
- env:
46+
LD_LIBRARY_PATH: ${{ steps.setup-pypy.outputs.pythonLocation }}/bin
47+
run: echo "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}" >> $GITHUB_ENV
48+
- run: pip install -r scripts/requirements.txt
49+
50+
# Bootstrap.
3851
- uses: actions/checkout@v4
3952
- uses: ./.github/actions/bootstrap
4053
with:
@@ -57,6 +70,20 @@ jobs:
5770
- uses: actions/checkout@v4
5871
with:
5972
ref: ${{ github.base_ref }}
73+
74+
# Setup pypy and link to the location expected by .cargo/config.toml.
75+
- uses: actions/setup-python@v5
76+
id: setup-pypy
77+
with:
78+
python-version: "pypy3.9"
79+
cache: 'pip'
80+
- run: ln -s '${{ steps.setup-pypy.outputs.python-path }}' /usr/local/bin/pypy3.9
81+
- env:
82+
LD_LIBRARY_PATH: ${{ steps.setup-pypy.outputs.pythonLocation }}/bin
83+
run: echo "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}" >> $GITHUB_ENV
84+
- run: pip install -r scripts/requirements.txt
85+
86+
# Bootstrap.
6087
- uses: ./.github/actions/bootstrap
6188
with:
6289
github_token: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)