Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(ci): make rust version in ci configurable
Browse files Browse the repository at this point in the history
nimrod-starkware committed Aug 7, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent de7b4db commit 1d25f90
Showing 11 changed files with 50 additions and 25 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/blockifier_ci.yml
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ jobs:
runs-on: starkware-ubuntu-20-04-medium
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: .github/workflows/install_rust.yml@main
- uses: Swatinem/rust-cache@v2
with:
prefix-key: "v0-rust-ubuntu-20.04"
@@ -40,7 +40,7 @@ jobs:
runs-on: starkware-ubuntu-20-04-medium
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: .github/workflows/install_rust.yml@main

- uses: Swatinem/rust-cache@v2
with:
2 changes: 1 addition & 1 deletion .github/workflows/blockifier_compiled_cairo.yml
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ jobs:
runs-on: starkware-ubuntu-20-04-medium
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: .github/workflows/install_rust.yml@main
- uses: Noelware/[email protected]
- uses: Swatinem/rust-cache@v2
with:
2 changes: 1 addition & 1 deletion .github/workflows/blockifier_coverage.yml
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ jobs:
CARGO_TERM_COLOR: always
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: .github/workflows/install_rust.yml@main
- uses: Swatinem/rust-cache@v2
with:
prefix-key: "v0-rust-ubuntu-20.04"
2 changes: 1 addition & 1 deletion .github/workflows/blockifier_post-merge.yml
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ jobs:
runs-on: starkware-ubuntu-20-04-medium
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: .github/workflows/install_rust.yml@main
- uses: Noelware/[email protected]
- uses: Swatinem/rust-cache@v2
with:
4 changes: 2 additions & 2 deletions .github/workflows/committer_ci.yml
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ jobs:
runs-on: starkware-ubuntu-latest-small
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: .github/workflows/install_rust.yml@main
- uses: Swatinem/rust-cache@v2

- id: auth
@@ -115,7 +115,7 @@ jobs:
runs-on: starkware-ubuntu-20-04-medium
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: .github/workflows/install_rust.yml@main
- uses: Swatinem/rust-cache@v2

# Commit hash on pull request event would be the head commit of the branch.
25 changes: 25 additions & 0 deletions .github/workflows/install_rust.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Installs rust toolchain. In order to set/fix the version, edit lines 20 & 27.
on:
workflow_call:
inputs:
components:
description: "An optional parameter that will be sent to dtolnay/rust-toolchain."
required: false
type: string

jobs:
install-rust:
runs-on: starkware-ubuntu-latest-small
steps:
- uses: actions/checkout@v4
- name: install rust toolchain with given components
if: "${{ inputs.components != '' }}"
uses: dtolnay/rust-toolchain@master
with:
toolchain: stable
components: ${{ inputs.components }}
- name: install rust toolchain without given components
if: "${{ inputs.components == '' }}"
uses: dtolnay/rust-toolchain@master
with:
toolchain: stable
10 changes: 5 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -58,7 +58,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: Noelware/[email protected]
- uses: dtolnay/rust-toolchain@stable
- uses: .github/workflows/install_rust.yml@main
with:
components: clippy
- uses: Swatinem/rust-cache@v2
@@ -83,7 +83,7 @@ jobs:
RUSTDOCFLAGS: "-D warnings"
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: .github/workflows/install_rust.yml@main
- uses: Swatinem/rust-cache@v2
- uses: Noelware/[email protected]
with:
@@ -97,7 +97,7 @@ jobs:
with:
# Fetch the entire history.
fetch-depth: 0
- uses: dtolnay/rust-toolchain@stable
- uses: .github/workflows/install_rust.yml@main
- uses: Noelware/[email protected]
- uses: Swatinem/rust-cache@v2
with:
@@ -137,7 +137,7 @@ jobs:
runs-on: starkware-ubuntu-latest-small
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: .github/workflows/install_rust.yml@main
- uses: Swatinem/rust-cache@v2
- uses: baptiste0928/cargo-install@v3
with:
@@ -159,7 +159,7 @@ jobs:
RUSTDOCFLAGS: "-D warnings"
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: .github/workflows/install_rust.yml@main
- uses: Swatinem/rust-cache@v2
- uses: Noelware/[email protected]
with:
12 changes: 6 additions & 6 deletions .github/workflows/papyrus_ci.yml
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@ jobs:
runs-on: starkware-ubuntu-latest-medium
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: .github/workflows/install_rust.yml@main
- uses: Swatinem/rust-cache@v2
- uses: Noelware/[email protected]
with:
@@ -60,7 +60,7 @@ jobs:
runs-on: starkware-ubuntu-latest-medium
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: .github/workflows/install_rust.yml@main
- uses: Swatinem/rust-cache@v2
- uses: Noelware/[email protected]
with:
@@ -79,7 +79,7 @@ jobs:
runs-on: starkware-ubuntu-latest-medium
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: .github/workflows/install_rust.yml@main
- uses: Swatinem/rust-cache@v2
- uses: Noelware/[email protected]
with:
@@ -96,7 +96,7 @@ jobs:
runs-on: starkware-ubuntu-latest-medium
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: .github/workflows/install_rust.yml@main
- uses: Swatinem/rust-cache@v2
- uses: Noelware/[email protected]

@@ -109,7 +109,7 @@ jobs:
runs-on: starkware-ubuntu-latest-medium
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: .github/workflows/install_rust.yml@main
- name: Set-Up
run: |
sudo apt-get update
@@ -173,7 +173,7 @@ jobs:
filters: |
target_directory:
- 'crates/papyrus_storage/src/db/**'
- uses: dtolnay/rust-toolchain@stable
- uses: .github/workflows/install_rust.yml@main
- uses: Swatinem/rust-cache@v2
# repeat this job 32 times. this is a random test for part of the code that may cause a corrupted database.
- run: for run in {1..32}; do cargo test -r -p papyrus_storage -- --include-ignored common_prefix_compare_with_simple_table_random; done
2 changes: 1 addition & 1 deletion .github/workflows/papyrus_nightly-tests-call.yml
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ jobs:
runs-on: ${{ inputs.os }}
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: .github/workflows/install_rust.yml@main
- uses: Swatinem/rust-cache@v2
- run: sudo apt update; sudo apt -y install libclang-dev
# Install libclang-dev that is not a part of the ubuntu vm in github actions.
10 changes: 5 additions & 5 deletions .github/workflows/papyrus_nightly-tests.yml
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ jobs:
if: github.event.schedule == '30 0 * * *'
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: .github/workflows/install_rust.yml@main
- uses: Swatinem/rust-cache@v2

- run: mkdir data
@@ -57,7 +57,7 @@ jobs:
if: github.event.schedule == '30 0 * * *'
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: .github/workflows/install_rust.yml@main
- uses: Swatinem/rust-cache@v2
- run: npm install -g [email protected]

@@ -73,7 +73,7 @@ jobs:
if: github.event.schedule == '30 0 * * *'
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: .github/workflows/install_rust.yml@main
- uses: Swatinem/rust-cache@v2
- run: cargo build -r -p papyrus_load_test

@@ -82,7 +82,7 @@ jobs:
if: github.event.schedule == '30 0 * * *'
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: .github/workflows/install_rust.yml@main
- uses: Swatinem/rust-cache@v2
- run: >
cargo test -r
@@ -98,6 +98,6 @@ jobs:
runs-on: starkware-ubuntu-latest-small
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: .github/workflows/install_rust.yml@main
- uses: Swatinem/rust-cache@v2
- run: for run in {1..100}; do cargo test -r -p papyrus_storage -- --include-ignored common_prefix_compare_with_simple_table_random; done
2 changes: 1 addition & 1 deletion .github/workflows/verify-deps.yml
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ jobs:
continue-on-error: true
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: .github/workflows/install_rust.yml@main
- name: Update Dependencies
run: cargo update --verbose
- name: Build

0 comments on commit 1d25f90

Please sign in to comment.