diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 2366eb3..de1946d 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -2,8 +2,6 @@ name: PR Tests on: pull_request: - push: - branches: [main] jobs: lint: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index aa11809..3e87ef1 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -12,15 +12,11 @@ jobs: test: uses: ./.github/workflows/test.yml - docs: - uses: ./.github/workflows/docs.yml - build-wheels: name: Build wheels (${{ matrix.os }}) runs-on: ${{ matrix.os }} needs: - test - - docs strategy: fail-fast: false matrix: @@ -62,7 +58,6 @@ jobs: runs-on: ubuntu-latest needs: - test - - docs steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/test-rust-accel.yml b/.github/workflows/test-rust-accel.yml deleted file mode 100644 index 1b6816c..0000000 --- a/.github/workflows/test-rust-accel.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: Test Rust Acceleration - -on: - workflow_call: - push: - branches: [main] - -jobs: - test-rust-accel: - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: [ubuntu-latest, macos-latest, windows-latest] - python-version: ["3.11"] - - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v5 - with: - python-version: ${{ matrix.python-version }} - - - name: Install Rust - uses: dtolnay/rust-toolchain@stable - - - name: Install uv - uses: astral-sh/setup-uv@v3 - - - name: Sync deps (locked) - run: | - uv sync --locked --all-groups --all-extras - - - name: Build & install Rust extension (maturin develop) - uses: PyO3/maturin-action@v1 - with: - command: develop - args: --release - working-directory: rust-base32 - - - name: Sanity check (import extension) - run: | - uv run python -c "import typeid_base32; print('typeid_base32 OK')" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d1ed1aa..30cc73f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -46,3 +46,43 @@ jobs: - name: Run linters run: | make check-linting + + test-rust-accel: + runs-on: ${{ matrix.os }} + needs: + - test + strategy: + fail-fast: false + matrix: + os: [ubuntu-latest, macos-latest, windows-latest] + python-version: ["3.11"] + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v5 + with: + python-version: ${{ matrix.python-version }} + + - name: Install Rust + uses: dtolnay/rust-toolchain@stable + + - name: Install uv + uses: astral-sh/setup-uv@v3 + + - name: Sync deps (locked) + run: | + uv sync --locked --all-groups --all-extras + + - name: Build & install Rust extension (maturin develop) + uses: PyO3/maturin-action@v1 + with: + command: develop + args: --release + working-directory: rust-base32 + + - name: Sanity check (import extension) + run: | + uv run python -c "import typeid_base32; print('typeid_base32 OK')"