From a495df61a37dc4cb00b0db6852acff664226dc75 Mon Sep 17 00:00:00 2001
From: Miranda Mundt <mmundt@sandia.gov>
Date: Fri, 10 Jan 2025 16:40:46 -0700
Subject: [PATCH] See if new ubuntu+headless action cause issues

---
 .github/workflows/test_branches.yml    | 20 +++++++++---------
 .github/workflows/test_pr_and_main.yml | 28 +++++++++++++-------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/test_branches.yml b/.github/workflows/test_branches.yml
index cfb9dcfa189..5f934b9a56d 100644
--- a/.github/workflows/test_branches.yml
+++ b/.github/workflows/test_branches.yml
@@ -30,7 +30,7 @@ env:
 jobs:
   lint:
     name: lint/style-and-typos
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
     - name: Checkout Pyomo source
       uses: actions/checkout@v4
@@ -70,13 +70,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-24.04]
         python: ['3.13']
         other: [""]
         category: [""]
 
         include:
-        - os: ubuntu-latest
+        - os: ubuntu-24.04
           python: '3.13'
           TARGET: linux
           PYENV: pip
@@ -92,7 +92,7 @@ jobs:
           PYENV: conda
           PACKAGES: glpk pytest-qt filelock
 
-        - os: ubuntu-latest
+        - os: ubuntu-24.04
           python: '3.11'
           other: /conda
           skip_doctest: 1
@@ -100,7 +100,7 @@ jobs:
           PYENV: conda
           PACKAGES: pytest-qt
 
-        - os: ubuntu-latest
+        - os: ubuntu-24.04
           python: '3.10'
           other: /mpi
           mpi: 3
@@ -109,7 +109,7 @@ jobs:
           PYENV: conda
           PACKAGES: openmpi mpi4py
 
-        - os: ubuntu-latest
+        - os: ubuntu-24.04
           python: '3.12'
           other: /cython
           setup_options: --with-cython
@@ -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
@@ -714,7 +714,7 @@ jobs:
 
   bare-python-env:
     name: linux/3.9/bare-env
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     timeout-minutes: 10
     steps:
     - name: Checkout Pyomo source
@@ -761,10 +761,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-13, windows-latest]
+        os: [ubuntu-24.04, macos-13, windows-latest]
 
         include:
-        - os: ubuntu-latest
+        - os: ubuntu-24.04
           TARGET: linux
         - os: macos-13
           TARGET: osx
diff --git a/.github/workflows/test_pr_and_main.yml b/.github/workflows/test_pr_and_main.yml
index 1c78cbde1bf..b2c5d8df9cc 100644
--- a/.github/workflows/test_pr_and_main.yml
+++ b/.github/workflows/test_pr_and_main.yml
@@ -38,7 +38,7 @@ env:
 jobs:
   lint:
     name: lint/style-and-typos
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     if: |
       contains(github.event.pull_request.title, '[WIP]') != true && !github.event.pull_request.draft
     steps:
@@ -67,13 +67,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-24.04, macos-latest, windows-latest]
         python: [ 3.9, '3.10', '3.11', '3.12', '3.13' ]
         other: [""]
         category: [""]
 
         include:
-        - os: ubuntu-latest
+        - os: ubuntu-24.04
           TARGET: linux
           PYENV: pip
 
@@ -86,7 +86,7 @@ jobs:
           PYENV: conda
           PACKAGES: glpk pytest-qt filelock
 
-        - os: ubuntu-latest
+        - os: ubuntu-24.04
           python: '3.11'
           other: /conda
           skip_doctest: 1
@@ -94,7 +94,7 @@ jobs:
           PYENV: conda
           PACKAGES: pytest-qt
 
-        - os: ubuntu-latest
+        - os: ubuntu-24.04
           python: '3.10'
           other: /mpi
           mpi: 3
@@ -103,7 +103,7 @@ jobs:
           PYENV: conda
           PACKAGES: openmpi mpi4py
 
-        - os: ubuntu-latest
+        - os: ubuntu-24.04
           python: '3.12'
           other: /cython
           setup_options: --with-cython
@@ -119,7 +119,7 @@ jobs:
           TARGET: win
           PYENV: pip
 
-        - os: ubuntu-latest
+        - os: ubuntu-24.04
           python: '3.11'
           other: /singletest
           category: "-m 'neos or importtest'"
@@ -127,7 +127,7 @@ jobs:
           TARGET: linux
           PYENV: pip
 
-        - os: ubuntu-latest
+        - os: ubuntu-24.04
           python: 3.9
           other: /slim
           slim: 1
@@ -135,7 +135,7 @@ jobs:
           TARGET: linux
           PYENV: pip
 
-        - os: ubuntu-latest
+        - os: ubuntu-24.04
           python: 3.12
           other: /numpy2
           slim: 1
@@ -144,14 +144,14 @@ jobs:
           PYENV: pip
           PACKAGES: "gurobipy dill numpy>2.0 scipy networkx"
 
-        - os: ubuntu-latest
+        - os: ubuntu-24.04
           python: '3.10'
           other: /pyutilib
           TARGET: linux
           PYENV: pip
           PACKAGES: pyutilib
 
-        - os: ubuntu-latest
+        - os: ubuntu-24.04
           python: pypy-3.9
           skip_doctest: 1
           TARGET: linux
@@ -748,7 +748,7 @@ jobs:
   bare-python-env:
     name: linux/3.9/bare-env
     needs: lint  # the linter job is a prerequisite for PRs
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     timeout-minutes: 10
     steps:
     - name: Checkout Pyomo source
@@ -795,10 +795,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-13, windows-latest]
+        os: [ubuntu-24.04, macos-13, windows-latest]
 
         include:
-        - os: ubuntu-latest
+        - os: ubuntu-24.04
           TARGET: linux
         - os: macos-13
           TARGET: osx