Skip to content

Commit

Permalink
chore: merge branch main-v0.13.2 into main (resolve conflicts)
Browse files Browse the repository at this point in the history
  • Loading branch information
meship-starkware committed Sep 5, 2024
1 parent 13570b7 commit d8e4732
Show file tree
Hide file tree
Showing 4 changed files with 1,283 additions and 37 deletions.
93 changes: 56 additions & 37 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,30 @@ jobs:
TITLE: ${{ github.event.pull_request.title }}
run: echo "$TITLE" | commitlint --verbose

code_style:
format:
runs-on: starkware-ubuntu-20-04-medium
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master # TODO(Nimrod, 15/8/2024): Use stable toolchain.
with:
components: rustfmt
toolchain: nightly-2024-04-29
- uses: Swatinem/rust-cache@v2
with:
prefix-key: "v0-rust-ubuntu-20.04"
- run: scripts/rust_fmt.sh --check

clippy:
runs-on: starkware-ubuntu-20-04-medium
steps:
# Enviorment setup.
- uses: actions/checkout@v4
- uses: Noelware/setup-protoc@1.1.0
- uses: baptiste0928/cargo-install@v3
- uses: ./.github/actions/install_rust
with:
crate: taplo-cli
version: '0.9.0'
locked: true
components: clippy
- uses: Swatinem/rust-cache@v2
with:
prefix-key: "v0-rust-ubuntu-20.04"

# Setup pypy and link to the location expected by .cargo/config.toml.
- uses: actions/setup-python@v5
Expand All @@ -67,7 +80,6 @@ jobs:
LD_LIBRARY_PATH: ${{ steps.setup-pypy.outputs.pythonLocation }}/bin
run: echo "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}" >> $GITHUB_ENV

<<<<<<< HEAD
- run: scripts/clippy.sh

doc:
Expand All @@ -76,38 +88,12 @@ jobs:
RUSTDOCFLAGS: "-D warnings"
steps:
- uses: actions/checkout@v4
||||||| e9fef0f80
- run: scripts/clippy.sh

doc:
runs-on: starkware-ubuntu-latest-small
# env:
# RUSTDOCFLAGS: "-D warnings"
steps:
- uses: actions/checkout@v4
=======
# Install rust components.
>>>>>>> origin/main-v0.13.2
- uses: ./.github/actions/install_rust
- uses: Swatinem/rust-cache@v2
- uses: Noelware/setup-protoc@1.1.0
with:
components: rustfmt, clippy

# Run tests.
- name: "Run rustfmt and clippy"
run: scripts/rust_fmt.sh --check
- name: "Run clippy"
run: scripts/clippy.sh
- name: "Run cargo doc"
run: cargo doc --workspace -r --document-private-items --no-deps
- name: "Run taplo"
run: scripts/taplo.sh
- name: "Run cargo check"
env:
RUSTDOCFLAGS: "-D warnings"
run: cargo check --workspace -r --all-features
- name: Run Machete (detect unused dependencies)
uses: bnjbvr/cargo-machete@main

version: ${{env.PROTOC_VERSION}}
- run: cargo doc --workspace -r --document-private-items --no-deps

run-workspace-tests:
runs-on: starkware-ubuntu-latest-small
Expand Down Expand Up @@ -158,6 +144,39 @@ jobs:
env:
SEED: 0

taplo:
runs-on: starkware-ubuntu-latest-small
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/install_rust
- uses: Swatinem/rust-cache@v2
- uses: baptiste0928/cargo-install@v3
with:
crate: taplo-cli
version: "0.9.0"
locked: true
- run: scripts/taplo.sh

machete:
runs-on: starkware-ubuntu-latest-small
steps:
- uses: actions/checkout@v4
- name: Run Machete (detect unused dependencies)
uses: bnjbvr/cargo-machete@main

check:
runs-on: starkware-ubuntu-latest-small
env:
RUSTDOCFLAGS: "-D warnings"
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/install_rust
- uses: Swatinem/rust-cache@v2
- uses: Noelware/setup-protoc@1.1.0
with:
version: ${{env.PROTOC_VERSION}}
- run: cargo check --workspace -r --all-features

merge-gatekeeper:
runs-on: starkware-ubuntu-latest-small
# Restrict permissions of the GITHUB_TOKEN.
Expand Down
Loading

0 comments on commit d8e4732

Please sign in to comment.