Skip to content

Commit

Permalink
Merge pull request #613 from Chia-Network/prettier
Browse files Browse the repository at this point in the history 
CHIA-920: Add Prettier to CI and pre-commit
  • Loading branch information
@Rigidity
Rigidity authored Jul 15, 2024
2 parents c0ccc51 + c0be415 commit baa617c
Show file tree
Hide file tree
Showing 14 changed files with 394 additions and 304 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/audit-check.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Security audit
on:
pull_request:
branches:
- '**'
- "**"

jobs:
security_audit:
Expand Down
157 changes: 78 additions & 79 deletions .github/workflows/benchmark.yml
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@

name: Tests

on:
push:
branches:
- main
tags:
- '**'
- "**"
pull_request:
branches:
- '**'
- "**"

jobs:
tests:
Expand All @@ -19,104 +18,104 @@ jobs:
fail-fast: false
matrix:
os: [macos-latest, ubuntu-latest, windows-latest]
python-version: ['3.8', '3.9', '3.10', '3.11']
python-version: ["3.8", "3.9", "3.10", "3.11"]

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 1
- uses: actions/checkout@v4
with:
fetch-depth: 1

- uses: chia-network/actions/setup-python@main
name: Install Python ${{ matrix.python-version }}
with:
python-version: ${{ matrix.python-version }}
- uses: chia-network/actions/setup-python@main
name: Install Python ${{ matrix.python-version }}
with:
python-version: ${{ matrix.python-version }}

- name: Update pip
run: |
- name: Update pip
run: |
python -m pip install --upgrade pip
- name: Set up rust
uses: dtolnay/rust-toolchain@stable
- name: Set up rust
uses: dtolnay/rust-toolchain@stable

- name: setup venv
run: |
python -m venv venv
- name: setup venv
run: |
python -m venv venv
- uses: chia-network/actions/activate-venv@main
- uses: chia-network/actions/activate-venv@main

- name: Install dependencies
run: |
python -m pip install maturin
rustup target add x86_64-unknown-linux-musl
python -m pip install pytest pytest-xdist
python -m pip install mypy
python -m pip install black
- name: Install dependencies
run: |
python -m pip install maturin
rustup target add x86_64-unknown-linux-musl
python -m pip install pytest pytest-xdist
python -m pip install mypy
python -m pip install black
- name: Build
run: |
python -m pip install clvm_tools colorama blspy chia-blockchain==2.1.2 clvm==0.9.8
maturin develop --release -m wheel/Cargo.toml
- name: Build
run: |
python -m pip install clvm_tools colorama blspy chia-blockchain==2.1.2 clvm==0.9.8
maturin develop --release -m wheel/Cargo.toml
- name: python mypy
run: |
mypy --ignore-missing-imports tests
- name: python mypy
run: |
mypy --ignore-missing-imports tests
- name: python black
run: |
black --check tests
black --check wheel/generate_type_stubs.py
- name: python black
run: |
black --check tests
black --check wheel/generate_type_stubs.py
- name: python tests
run: |
pytest tests
- name: python tests
run: |
pytest tests
generator-benchmarks:
name: Generator performance
runs-on: benchmark
strategy:
fail-fast: false
matrix:
python-version: ['3.10', '3.11']
python-version: ["3.10", "3.11"]

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 1
- uses: actions/checkout@v4
with:
fetch-depth: 1

- uses: chia-network/actions/setup-python@main
name: Install Python ${{ matrix.python-version }}
with:
python-version: ${{ matrix.python-version }}
- uses: chia-network/actions/setup-python@main
name: Install Python ${{ matrix.python-version }}
with:
python-version: ${{ matrix.python-version }}

- name: Set up rust
uses: dtolnay/rust-toolchain@stable
- name: Set up rust
uses: dtolnay/rust-toolchain@stable

- name: setup venv
run: |
python -m venv venv
- name: setup venv
run: |
python -m venv venv
- uses: chia-network/actions/activate-venv@main
- uses: chia-network/actions/activate-venv@main

- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install maturin colorama clvm_tools
rustup target add x86_64-unknown-linux-musl
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install maturin colorama clvm_tools
rustup target add x86_64-unknown-linux-musl
- name: Build
run: |
maturin develop --release -m wheel/Cargo.toml
- name: Build
run: |
maturin develop --release -m wheel/Cargo.toml
- name: test generators
run: |
cd tests
./test-generators.py
- name: test generators
run: |
cd tests
./test-generators.py
- name: Run cost checks
run: |
cd tests
./generate-programs.py
./run-programs.py
- name: Run cost checks
run: |
cd tests
./generate-programs.py
./run-programs.py
benchmarks:
name: rust benchmarks
Expand All @@ -125,13 +124,13 @@ jobs:
fail-fast: false

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 1
- uses: actions/checkout@v4
with:
fetch-depth: 1

- name: Set up rust
uses: dtolnay/rust-toolchain@stable
- name: Set up rust
uses: dtolnay/rust-toolchain@stable

- name: cargo bench
run: |
cargo bench --workspace --exclude chia_rs
- name: cargo bench
run: |
cargo bench --workspace --exclude chia_rs
90 changes: 45 additions & 45 deletions .github/workflows/build-crate-and-npm.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ on:
branches:
- main
tags:
- '**'
- "**"
pull_request:
branches:
- '**'
- "**"

jobs:
build_crate:
Expand All @@ -18,54 +18,54 @@ jobs:
fail-fast: false

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Set up rusts
uses: dtolnay/rust-toolchain@stable
with:
components: rustfmt, clippy
- name: Set up rusts
uses: dtolnay/rust-toolchain@stable
with:
components: rustfmt, clippy

- name: fmt
run: cargo fmt -- --files-with-diff --check
- name: clippy
run: cargo clippy
- name: tests
run: cargo test && cargo test --release
- name: build
run: cargo build --release
- name: fmt
run: cargo fmt -- --files-with-diff --check
- name: clippy
run: cargo clippy
- name: tests
run: cargo test && cargo test --release
- name: build
run: cargo build --release

- name: Upload crate artifacts
uses: actions/upload-artifact@v4
with:
name: crate
path: ./target/package/*-*.crate
- name: Upload crate artifacts
uses: actions/upload-artifact@v4
with:
name: crate
path: ./target/package/*-*.crate

- name: install wasm-pack
run: cargo install wasm-pack --locked
- name: install wasm-pack
run: cargo install wasm-pack --locked

- name: wasm-pack build and pack
run: cd wasm && wasm-pack build && wasm-pack pack
- name: wasm-pack build and pack
run: cd wasm && wasm-pack build && wasm-pack pack

- name: Upload npm pkg artifacts
uses: actions/upload-artifact@v4
with:
name: npm-pkg
path: ./wasm/pkg/*-*.tgz
- name: Upload npm pkg artifacts
uses: actions/upload-artifact@v4
with:
name: npm-pkg
path: ./wasm/pkg/*-*.tgz

- name: publish to crates.io if tagged
if: startsWith(github.event.ref, 'refs/tags')
env:
CARGO_REGISTRY_TOKEN: ${{ secrets.cargo_registry_token }}
run: |
cargo install cargo-workspaces --locked
cargo ws publish --publish-as-is
- name: publish to crates.io if tagged
if: startsWith(github.event.ref, 'refs/tags')
env:
CARGO_REGISTRY_TOKEN: ${{ secrets.cargo_registry_token }}
run: |
cargo install cargo-workspaces --locked
cargo ws publish --publish-as-is
# this has not been tested, so probably needs to be debugged next time a tag is created
- name: publish to npmjs.com if tagged
if: startsWith(github.event.ref, 'refs/tags')
uses: JS-DevTools/npm-publish@v3
with:
token: ${{ secrets.node_auth_token }}
package: wasm/pkg/package.json
# this has not been tested, so probably needs to be debugged next time a tag is created
- name: publish to npmjs.com if tagged
if: startsWith(github.event.ref, 'refs/tags')
uses: JS-DevTools/npm-publish@v3
with:
token: ${{ secrets.node_auth_token }}
package: wasm/pkg/package.json
Loading

0 comments on commit baa617c

Please sign in to comment.