Skip to content

Commit

Permalink
Update CI platforms
Browse files Browse the repository at this point in the history
  • Loading branch information
bwoodsend committed Jan 3, 2024
1 parent 0947b45 commit 22ce0c5
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 34 deletions.
1 change: 1 addition & 0 deletions .github/workflows/test-pgcc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5

# The recommended way to install PGCC is just raw wget/paste - no package
# managers.
Expand Down
42 changes: 10 additions & 32 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,51 +16,30 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
python-version: [3.9, 3.8, '3.10', 3.11]
python-version: [3.9, 3.8, '3.10', 3.11, 3.12]
architecture: ['x64']
include:
- os: macos-10.15
- os: macos-latest
python-version: 3.11
architecture: 'x64'
- os: macos-11.0
- os: windows-latest
python-version: 3.11
architecture: 'x64'
- name: Windows
os: windows-latest
python-version: 3.11
architecture: 'x64'
- name: Windows 32-bit
os: windows-latest
- os: windows-latest
python-version: 3.11
architecture: 'x86'

fail-fast: false

runs-on: ${{ matrix.os }}

steps:

- uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
architecture: ${{ matrix.architecture }}
- name: Cache pip cached wheels
uses: actions/cache@v3
env:
cache-name: cache-node-modules
with:
path: pip-cache
key: restore-key
restore-keys: restore-key

- name: Install
run: |
pip install --cache-dir=pip-cache wheel
pip install --cache-dir=pip-cache psutil
pip install --cache-dir=pip-cache -e .[test]
- run: pip install wheel psutil
- run: pip install -e .[test]

- name: Show gcc
run: gcc -v
Expand Down Expand Up @@ -89,7 +68,7 @@ jobs:
- name: Test gcc macOS
if: ${{ runner.os == 'macOS' }}
env:
CC: gcc-9
CC: gcc-13
MACOS_DEPLOYMENT_TARGET: '10.10'
run: ./test

Expand Down Expand Up @@ -123,9 +102,8 @@ jobs:
- name: Show wheel suffix
run: ls packaging/contains-slugs/dist/

# Test running the whole test suite, compiling everything fat. Only the
# macOS 11 images have a new enough Xcode to do this.
# Test running the whole test suite, compiling everything fat.
- run: ./test && ls packaging/contains-slugs/dist
if: ${{ matrix.os == 'macos-11.0' }}
if: runner.os == 'macOS'
env:
MACOS_ARCHITECTURE: universal2
5 changes: 3 additions & 2 deletions Dockerfile_manylinux
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,15 @@ RUN pip install wheel
# Install dependencies. Installing as many as possible before the ``COPY . /io``
# helps docker to cache them.
# Otherwise this block could be replaced with just ``COPY . /io``.
COPY setup.py /io/setup.py
COPY pyproject.toml /io/pyproject.toml
COPY README.rst /io/README.rst
COPY cslug/_version.py /io/cslug/_version.py

# Set the repo's root as the cwd.
WORKDIR /io
# Install more dependencies.
RUN pip install --prefer-binary -e .[test]
RUN pip install psutil
# Work around new metapath nonsense
RUN ln -s /io/cslug /opt/python/cp39-cp39/lib/python3.9/site-packages/cslug
# Copy across this repo.
COPY . /io

0 comments on commit 22ce0c5

Please sign in to comment.