Skip to content

Use GH naming for linux arm and simplify some non-matrix jobs #347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
emlowe merged 2 commits into from
Apr 10, 2026
Merged

Use GH naming for linux arm and simplify some non-matrix jobs #347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f468ea
workflow updates
emlowe Apr 10, 2026
b4aea9c
remove unneeded []
emlowe Apr 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/build-c-libraries.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,17 @@ jobs:
- name: macOS
matrix: macos
runs-on:
arm: [macos-15]
intel: [macos-15-intel]
arm: macos-15
intel: macos-15-intel
- name: Ubuntu
matrix: ubuntu
runs-on:
arm: [Linux, ARM64]
intel: [ubuntu-latest]
arm: ubuntu-24.04-arm
intel: ubuntu-latest
- name: Windows
matrix: windows
runs-on:
intel: [windows-latest]
intel: windows-latest
arch:
- name: ARM
matrix: arm
Expand All @@ -55,7 +55,7 @@ jobs:
name: Windows
matrix: windows
runs-on:
intel: [windows-latest]
intel: windows-latest
arch:
name: ARM
matrix: arm
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-riscv64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Linux
matrix: linux
emoji: 🐧
runs-on: [ubuntu-latest]
runs-on: ubuntu-latest
python:
- major-dot-minor: '3.10'
matrix: '3.10'
Expand Down
77 changes: 16 additions & 61 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,20 @@ jobs:
- name: macOS
matrix: macos
runs-on:
arm: [macos-15]
intel: [macos-15-intel]
arm: macos-15
intel: macos-15-intel
cibw-archs-macos:
arm: arm64
intel: x86_64
- name: Ubuntu
matrix: ubuntu
runs-on:
arm: [Linux, ARM64]
intel: [ubuntu-latest]
arm: ubuntu-24.04-arm
intel: ubuntu-latest
- name: Windows
matrix: windows
runs-on:
intel: [windows-latest]
intel: windows-latest
python:
- major-dot-minor: '3.10'
cibw-build: 'cp310-*'
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
name: Windows
matrix: windows
runs-on:
intel: [windows-latest]
intel: windows-latest
arch:
name: ARM
matrix: arm
Expand Down Expand Up @@ -153,23 +153,8 @@ jobs:
path: ./dist

build-sdist:
name: sdist - ${{ matrix.os.name }} ${{ matrix.python.major-dot-minor }} ${{ matrix.arch.name }}
runs-on: ${{ matrix.os.runs-on[matrix.arch.matrix] }}
strategy:
fail-fast: false
matrix:
os:
- name: Ubuntu
matrix: ubuntu
runs-on:
arm: [Linux, ARM64]
intel: [ubuntu-latest]
python:
- major-dot-minor: '3.12'
matrix: '3.12'
arch:
- name: Intel
matrix: intel
name: sdist - Ubuntu 3.12 Intel
runs-on: ubuntu-latest

steps:
- name: Clean workspace
Expand All @@ -182,7 +167,7 @@ jobs:

- uses: Chia-Network/actions/setup-python@main
with:
python-version: ${{ matrix.python.major-dot-minor }}
python-version: '3.12'

- name: Build source distribution
run: |
Expand All @@ -192,27 +177,12 @@ jobs:
- name: Upload artifacts
uses: actions/upload-artifact@v7
with:
name: packages-sdist-${{ matrix.os.name }}-${{ matrix.python.major-dot-minor }}-${{ matrix.arch.name }}
name: packages-sdist-Ubuntu-3.12-Intel
path: ./dist

check:
name: Check - ${{ matrix.os.name }} ${{ matrix.python.major-dot-minor }} ${{ matrix.arch.name }}
runs-on: ${{ matrix.os.runs-on[matrix.arch.matrix] }}
strategy:
fail-fast: false
matrix:
os:
- name: Ubuntu
matrix: ubuntu
runs-on:
arm: [Linux, ARM64]
intel: [ubuntu-latest]
python:
- major-dot-minor: '3.12'
matrix: '3.12'
arch:
- name: Intel
matrix: intel
name: Check - Ubuntu 3.12 Intel
runs-on: ubuntu-latest

steps:
- name: Clean workspace
Expand All @@ -225,7 +195,7 @@ jobs:

- uses: Chia-Network/actions/setup-python@main
with:
python-version: ${{ matrix.python.major-dot-minor }}
python-version: '3.12'

- name: flake8
run: |
Expand All @@ -238,27 +208,12 @@ jobs:
mypy --config-file mypi.ini setup.py tests

upload:
name: Upload to PyPI - ${{ matrix.os.name }} ${{ matrix.python.major-dot-minor }} ${{ matrix.arch.name }}
runs-on: ${{ matrix.os.runs-on[matrix.arch.matrix] }}
name: Upload to PyPI - Ubuntu 3.12 Intel
runs-on: ubuntu-latest
needs:
- build-wheels
- build-sdist
- check
strategy:
fail-fast: false
matrix:
os:
- name: Ubuntu
matrix: ubuntu
runs-on:
arm: [Linux, ARM64]
intel: [ubuntu-latest]
python:
- major-dot-minor: '3.12'
matrix: '3.12'
arch:
- name: Intel
matrix: intel

steps:
- name: Clean workspace
Expand All @@ -276,7 +231,7 @@ jobs:

- uses: Chia-Network/actions/setup-python@main
with:
python-version: ${{ matrix.python.major-dot-minor }}
python-version: '3.12'

- name: Download artifacts
uses: actions/download-artifact@v8
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,20 +86,20 @@ jobs:
- name: macOS
matrix: macos
runs-on:
arm: [macos-15]
intel: [macos-15-intel]
arm: macos-15
intel: macos-15-intel
cibw-archs-macos:
arm: arm64
intel: x86_64
- name: Ubuntu
matrix: ubuntu
runs-on:
arm: [Linux, ARM64]
intel: [ubuntu-latest]
arm: ubuntu-24.04-arm
intel: ubuntu-latest
- name: Windows
matrix: windows
runs-on:
intel: [windows-latest]
intel: windows-latest

arch:
- name: ARM
Expand All @@ -112,7 +112,7 @@ jobs:
name: Windows
matrix: windows
runs-on:
intel: [windows-latest]
intel: windows-latest
arch:
name: ARM
matrix: arm
Expand Down
Loading