Skip to content

Commit

Permalink
Merge pull request #229 from robotpy/fix-tests
Browse files Browse the repository at this point in the history
Fix tests and update black excludes
  • Loading branch information
virtuald authored Aug 25, 2024
2 parents 290f478 + 2bfae4e commit 00080e1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 18 deletions.
24 changes: 7 additions & 17 deletions .github/workflows/dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ jobs:
strategy:
max-parallel: ${{ fromJSON(needs.setup_concurrency.outputs.max-parallel).v }}
matrix:
os: [windows-latest, macos-latest, ubuntu-20.04]
os: ["ubuntu-22.04", "macos-12", "windows-2022"]
python_version:
- '3.8'
- '3.9'
Expand All @@ -98,9 +98,9 @@ jobs:
- '3.12'
architecture: [x86, x64]
exclude:
- os: macos-latest
- os: macos-12
architecture: x86
- os: ubuntu-20.04
- os: ubuntu-22.04
architecture: x86

steps:
Expand All @@ -119,21 +119,11 @@ jobs:
name: dist
path: dist

- name: Set ccache variant
shell: bash
id: ccache
run: |
if [[ "${{ matrix.os }}" == windows-* ]]; then
echo "VARIANT=sccache" >> $GITHUB_OUTPUT
else
echo "VARIANT=ccache" >> $GITHUB_OUTPUT
fi
- name: Setup ccache
uses: hendrikmuhs/ccache-action@v1.2
uses: robotpy/ccache-action@fork
with:
key: ${{ matrix.os }}-${{ matrix.architecture }}-${{ matrix.python_version }}
variant: ${{ steps.ccache.outputs.variant }}
variant: ccache

- name: Install
shell: bash
Expand All @@ -150,7 +140,7 @@ jobs:
env:
RPYBUILD_PARALLEL: 1
RPYBUILD_STRIP_LIBPYTHON: 1
RPYBUILD_CC_LAUNCHER: ${{ steps.ccache.outputs.variant }}
RPYBUILD_CC_LAUNCHER: ccache
working-directory: tests
run: |
python run_tests.py
Expand All @@ -176,7 +166,7 @@ jobs:

- run: apt-get update
- name: Setup ccache
uses: hendrikmuhs/ccache-action@v1.2
uses: robotpy/ccache-action@fork
with:
key: ${{ matrix.container }}

Expand Down
1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,4 @@ write_to = "robotpy_build/version.py"
target-version = ['py38']
extend-exclude = '''
^/robotpy_build/pybind11
^/robotpy_build/version.py
'''

0 comments on commit 00080e1

Please sign in to comment.