Skip to content

Commit

Permalink
Update ubuntu; update headless action
Browse files Browse the repository at this point in the history
  • Loading branch information
mrmundt committed Jan 10, 2025
1 parent 14f21e6 commit 6a0be49
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 31 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/release_wheel_creation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
strategy:
fail-fast: true
matrix:
os: [ubuntu-22.04, windows-latest, macos-latest]
os: [ubuntu-latest, windows-latest, macos-latest]
arch: [all]
wheel-version: ['cp39*', 'cp310*', 'cp311*', 'cp312*', 'cp313*']

Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-22.04]
os: [ubuntu-latest]
arch: [all]
wheel-version: ['cp39*', 'cp310*', 'cp311*', 'cp312*', 'cp313*']

Expand Down Expand Up @@ -145,7 +145,7 @@ jobs:

pure_python:
name: pure_python_wheel
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.11']
Expand Down Expand Up @@ -175,9 +175,9 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-22.04]
os: [ubuntu-latest]
include:
- os: ubuntu-22.04
- os: ubuntu-latest
TARGET: generic_tarball
python-version: [3.9]
steps:
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/test_branches.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ env:
jobs:
lint:
name: lint/style-and-typos
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- name: Checkout Pyomo source
uses: actions/checkout@v4
Expand Down Expand Up @@ -70,13 +70,13 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-22.04]
os: [ubuntu-latest]
python: ['3.13']
other: [""]
category: [""]

include:
- os: ubuntu-22.04
- os: ubuntu-latest
python: '3.13'
TARGET: linux
PYENV: pip
Expand All @@ -92,15 +92,15 @@ jobs:
PYENV: conda
PACKAGES: glpk pytest-qt filelock

- os: ubuntu-22.04
- os: ubuntu-latest
python: '3.11'
other: /conda
skip_doctest: 1
TARGET: linux
PYENV: conda
PACKAGES: pytest-qt

- os: ubuntu-22.04
- os: ubuntu-latest
python: '3.10'
other: /mpi
mpi: 3
Expand All @@ -109,7 +109,7 @@ jobs:
PYENV: conda
PACKAGES: openmpi mpi4py

- os: ubuntu-22.04
- os: ubuntu-latest
python: '3.12'
other: /cython
setup_options: --with-cython
Expand Down Expand Up @@ -234,7 +234,7 @@ jobs:
# have support for OSX.
- name: Set up UI testing infrastructure
if: ${{ matrix.TARGET != 'osx' }}
uses: pyvista/setup-headless-display-action@v2
uses: pyvista/setup-headless-display-action@v3
with:
qt: true
pyvista: false
Expand Down Expand Up @@ -688,7 +688,7 @@ jobs:
bare-python-env:
name: linux/3.9/bare-env
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- name: Checkout Pyomo source
Expand Down Expand Up @@ -735,10 +735,10 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-22.04, macos-13, windows-latest]
os: [ubuntu-latest, macos-13, windows-latest]

include:
- os: ubuntu-22.04
- os: ubuntu-latest
TARGET: linux
- os: macos-13
TARGET: osx
Expand Down
30 changes: 15 additions & 15 deletions .github/workflows/test_pr_and_main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ env:
jobs:
lint:
name: lint/style-and-typos
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
if: |
contains(github.event.pull_request.title, '[WIP]') != true && !github.event.pull_request.draft
steps:
Expand Down Expand Up @@ -67,13 +67,13 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-22.04, macos-latest, windows-latest]
os: [ubuntu-latest, macos-latest, windows-latest]
python: [ 3.9, '3.10', '3.11', '3.12', '3.13' ]
other: [""]
category: [""]

include:
- os: ubuntu-22.04
- os: ubuntu-latest
TARGET: linux
PYENV: pip

Expand All @@ -86,15 +86,15 @@ jobs:
PYENV: conda
PACKAGES: glpk pytest-qt filelock

- os: ubuntu-22.04
- os: ubuntu-latest
python: '3.11'
other: /conda
skip_doctest: 1
TARGET: linux
PYENV: conda
PACKAGES: pytest-qt

- os: ubuntu-22.04
- os: ubuntu-latest
python: '3.10'
other: /mpi
mpi: 3
Expand All @@ -103,7 +103,7 @@ jobs:
PYENV: conda
PACKAGES: openmpi mpi4py

- os: ubuntu-22.04
- os: ubuntu-latest
python: '3.12'
other: /cython
setup_options: --with-cython
Expand All @@ -119,23 +119,23 @@ jobs:
TARGET: win
PYENV: pip

- os: ubuntu-22.04
- os: ubuntu-latest
python: '3.11'
other: /singletest
category: "-m 'neos or importtest'"
skip_doctest: 1
TARGET: linux
PYENV: pip

- os: ubuntu-22.04
- os: ubuntu-latest
python: 3.9
other: /slim
slim: 1
skip_doctest: 1
TARGET: linux
PYENV: pip

- os: ubuntu-22.04
- os: ubuntu-latest
python: 3.12
other: /numpy2
slim: 1
Expand All @@ -144,14 +144,14 @@ jobs:
PYENV: pip
PACKAGES: "gurobipy dill numpy>2.0 scipy networkx"

- os: ubuntu-22.04
- os: ubuntu-latest
python: '3.10'
other: /pyutilib
TARGET: linux
PYENV: pip
PACKAGES: pyutilib

- os: ubuntu-22.04
- os: ubuntu-latest
python: pypy-3.9
skip_doctest: 1
TARGET: linux
Expand Down Expand Up @@ -266,7 +266,7 @@ jobs:
# have support for OSX.
- name: Set up UI testing infrastructure
if: ${{ matrix.TARGET != 'osx' }}
uses: pyvista/setup-headless-display-action@v2
uses: pyvista/setup-headless-display-action@v3
with:
qt: true
pyvista: false
Expand Down Expand Up @@ -723,7 +723,7 @@ jobs:
bare-python-env:
name: linux/3.9/bare-env
needs: lint # the linter job is a prerequisite for PRs
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- name: Checkout Pyomo source
Expand Down Expand Up @@ -770,10 +770,10 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-22.04, macos-13, windows-latest]
os: [ubuntu-latest, macos-13, windows-latest]

include:
- os: ubuntu-22.04
- os: ubuntu-latest
TARGET: linux
- os: macos-13
TARGET: osx
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/url_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:

jobs:
url_check:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- name: Checkout Pyomo source
uses: actions/checkout@v4
Expand Down

0 comments on commit 6a0be49

Please sign in to comment.