From 24b65e0f744bb1e1b0a391741906a9a50e33a4ce Mon Sep 17 00:00:00 2001 From: Mike Edmunds Date: Tue, 12 Mar 2024 13:52:57 -0700 Subject: [PATCH] CI/CD: upgrade workflow dependencies --- .github/workflows/integration-test.yml | 12 ++++++------ .github/workflows/release.yml | 6 +++--- .github/workflows/test.yml | 12 ++++++------ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 2f161ccb..f7d8768b 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -15,21 +15,21 @@ jobs: skip_duplicate_runs: # Avoid running the live integration tests twice on the same code # (to conserve limited sending quotas in the live ESP test accounts) - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 continue-on-error: true outputs: should_skip: ${{ steps.skip_check.outputs.should_skip }} steps: - id: skip_check - # uses: fkirc/skip-duplicate-actions@v5.3.0 - uses: fkirc/skip-duplicate-actions@12aca0a884f6137d619d6a8a09fcc3406ced5281 + # uses: fkirc/skip-duplicate-actions@v5.3.1 + uses: fkirc/skip-duplicate-actions@f75f66ce1886f00957d99748a42c724f4330bdcf with: concurrent_skipping: "same_content_newer" cancel_others: "true" test: name: ${{ matrix.config.tox }} ${{ matrix.config.options }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 needs: skip_duplicate_runs if: needs.skip_duplicate_runs.outputs.should_skip != 'true' timeout-minutes: 15 @@ -54,9 +54,9 @@ jobs: steps: - name: Get code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Python ${{ matrix.config.python }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.config.python }} - name: Install tox diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5625f101..11461d24 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,17 +19,17 @@ on: jobs: release: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 environment: release permissions: # `gh release` requires write permission on repo contents contents: write steps: - name: Get code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.10" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5fff3265..013a8c73 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,12 +13,12 @@ on: jobs: get-envlist: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 outputs: envlist: ${{ steps.generate-envlist.outputs.envlist }} steps: - name: Get code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install tox-gh-matrix run: | python -m pip install 'tox<4' 'tox-gh-matrix<0.3' @@ -30,7 +30,7 @@ jobs: python -m tox --gh-matrix-dump # for debugging test: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 needs: get-envlist strategy: matrix: @@ -41,16 +41,16 @@ jobs: timeout-minutes: 15 steps: - name: Get code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Python ${{ matrix.tox.python.version }} # Ensure matrix Python version is installed and available for tox - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.tox.python.spec }} - name: Setup default Python # Change default Python version back to something consistent # for installing/running tox - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.8" - name: Install tox