From 42688d12649e915d1213739e9a93c6e9fce60062 Mon Sep 17 00:00:00 2001 From: Miranda Mundt Date: Thu, 1 Feb 2024 09:23:58 -0700 Subject: [PATCH 1/3] Actions Version Update: Address node.js deprecations --- .github/workflows/release_wheel_creation.yml | 2 +- .github/workflows/test_branches.yml | 20 ++++++++++---------- .github/workflows/test_pr_and_main.yml | 20 ++++++++++---------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/release_wheel_creation.yml b/.github/workflows/release_wheel_creation.yml index 72a3ce1110b..3c837cb62b2 100644 --- a/.github/workflows/release_wheel_creation.yml +++ b/.github/workflows/release_wheel_creation.yml @@ -91,7 +91,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install dependencies diff --git a/.github/workflows/test_branches.yml b/.github/workflows/test_branches.yml index a55a5db2433..1a1a0e5bd57 100644 --- a/.github/workflows/test_branches.yml +++ b/.github/workflows/test_branches.yml @@ -35,7 +35,7 @@ jobs: - name: Checkout Pyomo source uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.10' - name: Black Formatting Check @@ -134,7 +134,7 @@ jobs: | tr '\n' ' ' | sed 's/ \+/ /g' >> $GITHUB_ENV #- name: Pip package cache - # uses: actions/cache@v3 + # uses: actions/cache@v4 # if: matrix.PYENV == 'pip' # id: pip-cache # with: @@ -142,7 +142,7 @@ jobs: # key: pip-${{env.CACHE_VER}}.0-${{runner.os}}-${{matrix.python}} #- name: OS package cache - # uses: actions/cache@v3 + # uses: actions/cache@v4 # if: matrix.TARGET != 'osx' # id: os-cache # with: @@ -150,7 +150,7 @@ jobs: # key: pkg-${{env.CACHE_VER}}.0-${{runner.os}} - name: TPL package download cache - uses: actions/cache@v3 + uses: actions/cache@v4 if: ${{ ! matrix.slim }} id: download-cache with: @@ -202,13 +202,13 @@ jobs: - name: Set up Python ${{ matrix.python }} if: matrix.PYENV == 'pip' - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python }} - name: Set up Miniconda Python ${{ matrix.python }} if: matrix.PYENV == 'conda' - uses: conda-incubator/setup-miniconda@v2 + uses: conda-incubator/setup-miniconda@v3 with: auto-update-conda: false python-version: ${{ matrix.python }} @@ -668,7 +668,7 @@ jobs: uses: actions/checkout@v4 - name: Set up Python 3.8 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.8 @@ -724,19 +724,19 @@ jobs: # We need the source for .codecov.yml and running "coverage xml" #- name: Pip package cache - # uses: actions/cache@v3 + # uses: actions/cache@v4 # id: pip-cache # with: # path: cache/pip # key: pip-${{env.CACHE_VER}}.0-${{runner.os}}-3.8 - name: Download build artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: path: artifacts - name: Set up Python 3.8 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.8 diff --git a/.github/workflows/test_pr_and_main.yml b/.github/workflows/test_pr_and_main.yml index ac7691d32ae..f9a8cef99b2 100644 --- a/.github/workflows/test_pr_and_main.yml +++ b/.github/workflows/test_pr_and_main.yml @@ -38,7 +38,7 @@ jobs: - name: Checkout Pyomo source uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.10' - name: Black Formatting Check @@ -164,7 +164,7 @@ jobs: | tr '\n' ' ' | sed 's/ \+/ /g' >> $GITHUB_ENV #- name: Pip package cache - # uses: actions/cache@v3 + # uses: actions/cache@v4 # if: matrix.PYENV == 'pip' # id: pip-cache # with: @@ -172,7 +172,7 @@ jobs: # key: pip-${{env.CACHE_VER}}.0-${{runner.os}}-${{matrix.python}} #- name: OS package cache - # uses: actions/cache@v3 + # uses: actions/cache@v4 # if: matrix.TARGET != 'osx' # id: os-cache # with: @@ -180,7 +180,7 @@ jobs: # key: pkg-${{env.CACHE_VER}}.0-${{runner.os}} - name: TPL package download cache - uses: actions/cache@v3 + uses: actions/cache@v4 if: ${{ ! matrix.slim }} id: download-cache with: @@ -232,13 +232,13 @@ jobs: - name: Set up Python ${{ matrix.python }} if: matrix.PYENV == 'pip' - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python }} - name: Set up Miniconda Python ${{ matrix.python }} if: matrix.PYENV == 'conda' - uses: conda-incubator/setup-miniconda@v2 + uses: conda-incubator/setup-miniconda@v3 with: auto-update-conda: false python-version: ${{ matrix.python }} @@ -699,7 +699,7 @@ jobs: uses: actions/checkout@v4 - name: Set up Python 3.8 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.8 @@ -755,19 +755,19 @@ jobs: # We need the source for .codecov.yml and running "coverage xml" #- name: Pip package cache - # uses: actions/cache@v3 + # uses: actions/cache@v4 # id: pip-cache # with: # path: cache/pip # key: pip-${{env.CACHE_VER}}.0-${{runner.os}}-3.8 - name: Download build artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: path: artifacts - name: Set up Python 3.8 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: 3.8 From 71a0a09921709a06dc3da394a2c697616abda2bf Mon Sep 17 00:00:00 2001 From: Miranda Mundt Date: Thu, 1 Feb 2024 11:29:59 -0700 Subject: [PATCH 2/3] Update upload-artifact version --- .github/workflows/release_wheel_creation.yml | 6 +++--- .github/workflows/test_branches.yml | 2 +- .github/workflows/test_pr_and_main.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release_wheel_creation.yml b/.github/workflows/release_wheel_creation.yml index 3c837cb62b2..ef44806d6d4 100644 --- a/.github/workflows/release_wheel_creation.yml +++ b/.github/workflows/release_wheel_creation.yml @@ -41,7 +41,7 @@ jobs: CIBW_BUILD_VERBOSITY: 1 CIBW_BEFORE_BUILD: pip install cython pybind11 CIBW_CONFIG_SETTINGS: '--global-option="--with-cython --with-distributable-extensions"' - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: native_wheels path: dist/*.whl @@ -72,7 +72,7 @@ jobs: CIBW_BUILD_VERBOSITY: 1 CIBW_BEFORE_BUILD: pip install cython pybind11 CIBW_CONFIG_SETTINGS: '--global-option="--with-cython --with-distributable-extensions"' - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: alt_wheels path: dist/*.whl @@ -102,7 +102,7 @@ jobs: run: | python setup.py --without-cython sdist --format=gztar - name: Upload artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: generictarball path: dist diff --git a/.github/workflows/test_branches.yml b/.github/workflows/test_branches.yml index 1a1a0e5bd57..a6857fb996e 100644 --- a/.github/workflows/test_branches.yml +++ b/.github/workflows/test_branches.yml @@ -648,7 +648,7 @@ jobs: coverage xml -i - name: Record build artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{github.job}}_${{env.GHA_JOBGROUP}}-${{env.GHA_JOBNAME}} path: | diff --git a/.github/workflows/test_pr_and_main.yml b/.github/workflows/test_pr_and_main.yml index f9a8cef99b2..949d3099d74 100644 --- a/.github/workflows/test_pr_and_main.yml +++ b/.github/workflows/test_pr_and_main.yml @@ -678,7 +678,7 @@ jobs: coverage xml -i - name: Record build artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{github.job}}_${{env.GHA_JOBGROUP}}-${{env.GHA_JOBNAME}} path: | From 1d243baef3301fb7c552d701adaa85b8b8bfaf4d Mon Sep 17 00:00:00 2001 From: Miranda Mundt Date: Thu, 1 Feb 2024 12:23:40 -0700 Subject: [PATCH 3/3] Update codecov-action version --- .github/workflows/test_branches.yml | 4 ++-- .github/workflows/test_pr_and_main.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test_branches.yml b/.github/workflows/test_branches.yml index a6857fb996e..e5513d25975 100644 --- a/.github/workflows/test_branches.yml +++ b/.github/workflows/test_branches.yml @@ -831,7 +831,7 @@ jobs: - name: Upload codecov reports if: github.repository_owner == 'Pyomo' || github.ref != 'refs/heads/main' - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: files: coverage.xml token: ${{ secrets.PYOMO_CODECOV_TOKEN }} @@ -843,7 +843,7 @@ jobs: if: | hashFiles('coverage-other.xml') != '' && (github.repository_owner == 'Pyomo' || github.ref != 'refs/heads/main') - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: files: coverage-other.xml token: ${{ secrets.PYOMO_CODECOV_TOKEN }} diff --git a/.github/workflows/test_pr_and_main.yml b/.github/workflows/test_pr_and_main.yml index 949d3099d74..c5028606c17 100644 --- a/.github/workflows/test_pr_and_main.yml +++ b/.github/workflows/test_pr_and_main.yml @@ -862,7 +862,7 @@ jobs: - name: Upload codecov reports if: github.repository_owner == 'Pyomo' || github.ref != 'refs/heads/main' - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: files: coverage.xml token: ${{ secrets.PYOMO_CODECOV_TOKEN }} @@ -874,7 +874,7 @@ jobs: if: | hashFiles('coverage-other.xml') != '' && (github.repository_owner == 'Pyomo' || github.ref != 'refs/heads/main') - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: files: coverage-other.xml token: ${{ secrets.PYOMO_CODECOV_TOKEN }}