Skip to content

Commit

Permalink
Merge branch 'main' into more_3_12
Browse files Browse the repository at this point in the history
  • Loading branch information
altendky committed Jul 22, 2024
2 parents 1019427 + e1a7b55 commit 0c27c31
Show file tree
Hide file tree
Showing 230 changed files with 14,153 additions and 6,183 deletions.
72 changes: 72 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
# This file is managed by the repo-content-updater project. Manual changes here will result in a PR to bring back
# inline with the upstream template, unless you remove the dependabot managed file property from the repo

version: 2
updates:
- package-ecosystem: "gomod"
directory: /
schedule:
interval: "weekly"
day: "tuesday"
open-pull-requests-limit: 10
rebase-strategy: auto
labels:
- dependencies
- go
- "Changed"
reviewers: ["cmmarslender", "starttoaster"]
groups:
global:
patterns:
- "*"

- package-ecosystem: "pip"
directory: /
schedule:
interval: "weekly"
day: "tuesday"
open-pull-requests-limit: 10
rebase-strategy: auto
labels:
- dependencies
- python
- "Changed"
reviewers: ["emlowe", "altendky"]

- package-ecosystem: "github-actions"
directory: /
schedule:
interval: "weekly"
day: "tuesday"
open-pull-requests-limit: 10
rebase-strategy: auto
labels:
- dependencies
- github_actions
- "Changed"
reviewers: ["cmmarslender", "Starttoaster", "pmaslana"]

- package-ecosystem: "npm"
directory: /
schedule:
interval: "weekly"
day: "tuesday"
open-pull-requests-limit: 10
rebase-strategy: auto
labels:
- dependencies
- javascript
- "Changed"
reviewers: ["cmmarslender", "ChiaMineJP"]

- package-ecosystem: cargo
directory: /
schedule:
interval: "weekly"
day: "tuesday"
open-pull-requests-limit: 10
rebase-strategy: auto
labels:
- dependencies
- rust
- "Changed"
4 changes: 2 additions & 2 deletions .github/workflows/audit-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ name: Security audit
on:
pull_request:
branches:
- '**'
- "**"

jobs:
security_audit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: cargo audit
run: cargo audit --ignore RUSTSEC-2023-0071
153 changes: 79 additions & 74 deletions .github/workflows/benchmark.yml
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,98 +18,104 @@ jobs:
fail-fast: false
matrix:
os: [macos-latest, ubuntu-latest, windows-latest]
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]

steps:
- uses: actions/checkout@v3
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
python -m pip install mypy
- 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 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', '3.12']
python-version: ["3.10", "3.11", "3.12"]

steps:
- uses: actions/checkout@v3
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 @@ -119,13 +124,13 @@ jobs:
fail-fast: false

steps:
- uses: actions/checkout@v3
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
Loading

0 comments on commit 0c27c31

Please sign in to comment.