Skip to content

Commit

Permalink
Nits and consistency
Browse files Browse the repository at this point in the history
  • Loading branch information
Rigidity committed Jul 16, 2024
1 parent 02eda3d commit 5e8ba32
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 31 deletions.
9 changes: 3 additions & 6 deletions .github/workflows/build-riscv64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ jobs:
os: [ubuntu-latest]

steps:
- name: Checkout repository
uses: actions/checkout@v4
- uses: actions/checkout@v4

- name: Set up QEMU on x86_64
id: qemu
Expand Down Expand Up @@ -58,8 +57,7 @@ jobs:
matrix: "3.11"

steps:
- name: Checkout repository
uses: actions/checkout@v4
- uses: actions/checkout@v4

- name: Set up QEMU on x86_64
id: qemu
Expand Down Expand Up @@ -94,8 +92,7 @@ jobs:
needs:
- build-wheels
steps:
- name: Checkout code
uses: actions/checkout@v4
- uses: actions/checkout@v4

- name: Set env
uses: Chia-Network/actions/setjobenv@main
Expand Down
33 changes: 11 additions & 22 deletions .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,7 @@ jobs:
- name: Clean workspace
uses: Chia-Network/actions/clean-workspace@main

- name: Checkout code
uses: actions/checkout@v4
- uses: actions/checkout@v4

- uses: Chia-Network/actions/setup-python@main
with:
Expand Down Expand Up @@ -196,8 +195,7 @@ jobs:
name: Check chia_rs.pyi
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
- uses: actions/checkout@v4

- uses: Chia-Network/actions/setup-python@main

Expand Down Expand Up @@ -229,8 +227,7 @@ jobs:
- name: Clean workspace
uses: Chia-Network/actions/clean-workspace@main

- name: Checkout code
uses: actions/checkout@v4
- uses: actions/checkout@v4

- uses: Chia-Network/actions/setup-python@main
with:
Expand Down Expand Up @@ -259,13 +256,10 @@ jobs:
python-version: 3.12

- name: Install dependencies
run: |
python -m pip install mypy
python -m pip install black
run: python -m pip install mypy black

- name: python mypy
run: |
mypy --ignore-missing-imports tests
run: mypy --ignore-missing-imports tests

- name: python black
run: |
Expand All @@ -281,15 +275,15 @@ jobs:
python-version: ["3.8", "3.9", "3.10", "3.11"]
name: Tests (${{ matrix.os.name }} ${{ matrix.python-version }})
steps:
# the test files are read verbatim, making it problematic if git is
# allowed to insert \r when checking out files
# The test files are read verbatim, making it problematic if git is
# allowed to insert \r when checking out files.
- name: Disable git autocrlf
run: |
git config --global core.autocrlf false
run: git config --global core.autocrlf false

- uses: actions/checkout@v4

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

- name: Pytest
if: matrix.os == 'ubuntu-latest'
Expand All @@ -310,8 +304,6 @@ jobs:

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

- uses: chia-network/actions/setup-python@main
name: Install Python ${{ matrix.python-version }}
Expand Down Expand Up @@ -373,10 +365,7 @@ jobs:
- name: Clean workspace
uses: Chia-Network/actions/clean-workspace@main

- name: Checkout code
uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/checkout@v4

- uses: Chia-Network/actions/setup-python@main
with:
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,8 @@ jobs:

# The test files are read verbatim, making it problematic if git is
# allowed to insert \r when checking out files.
- name: disable git autocrlf
run: |
git config --global core.autocrlf false
- name: Disable git autocrlf
run: git config --global core.autocrlf false

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

0 comments on commit 5e8ba32

Please sign in to comment.