Skip to content

Commit 00080e1

Browse files
authored
Merge pull request #229 from robotpy/fix-tests
Fix tests and update black excludes
2 parents 290f478 + 2bfae4e commit 00080e1

File tree

2 files changed

+7
-18
lines changed

2 files changed

+7
-18
lines changed

.github/workflows/dist.yml

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
strategy:
9090
max-parallel: ${{ fromJSON(needs.setup_concurrency.outputs.max-parallel).v }}
9191
matrix:
92-
os: [windows-latest, macos-latest, ubuntu-20.04]
92+
os: ["ubuntu-22.04", "macos-12", "windows-2022"]
9393
python_version:
9494
- '3.8'
9595
- '3.9'
@@ -98,9 +98,9 @@ jobs:
9898
- '3.12'
9999
architecture: [x86, x64]
100100
exclude:
101-
- os: macos-latest
101+
- os: macos-12
102102
architecture: x86
103-
- os: ubuntu-20.04
103+
- os: ubuntu-22.04
104104
architecture: x86
105105

106106
steps:
@@ -119,21 +119,11 @@ jobs:
119119
name: dist
120120
path: dist
121121

122-
- name: Set ccache variant
123-
shell: bash
124-
id: ccache
125-
run: |
126-
if [[ "${{ matrix.os }}" == windows-* ]]; then
127-
echo "VARIANT=sccache" >> $GITHUB_OUTPUT
128-
else
129-
echo "VARIANT=ccache" >> $GITHUB_OUTPUT
130-
fi
131-
132122
- name: Setup ccache
133-
uses: hendrikmuhs/ccache-action@v1.2
123+
uses: robotpy/ccache-action@fork
134124
with:
135125
key: ${{ matrix.os }}-${{ matrix.architecture }}-${{ matrix.python_version }}
136-
variant: ${{ steps.ccache.outputs.variant }}
126+
variant: ccache
137127

138128
- name: Install
139129
shell: bash
@@ -150,7 +140,7 @@ jobs:
150140
env:
151141
RPYBUILD_PARALLEL: 1
152142
RPYBUILD_STRIP_LIBPYTHON: 1
153-
RPYBUILD_CC_LAUNCHER: ${{ steps.ccache.outputs.variant }}
143+
RPYBUILD_CC_LAUNCHER: ccache
154144
working-directory: tests
155145
run: |
156146
python run_tests.py
@@ -176,7 +166,7 @@ jobs:
176166

177167
- run: apt-get update
178168
- name: Setup ccache
179-
uses: hendrikmuhs/ccache-action@v1.2
169+
uses: robotpy/ccache-action@fork
180170
with:
181171
key: ${{ matrix.container }}
182172

pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,4 @@ write_to = "robotpy_build/version.py"
99
target-version = ['py38']
1010
extend-exclude = '''
1111
^/robotpy_build/pybind11
12-
^/robotpy_build/version.py
1312
'''

0 commit comments

Comments
 (0)