From 16ce5954ab4569ca32777afca69654a8c3199e7c Mon Sep 17 00:00:00 2001 From: Spacetown <40258682+spacetown@users.noreply.github.com> Date: Sun, 4 Feb 2024 21:05:46 +0100 Subject: [PATCH 1/6] Update version of checkout step --- .github/workflows/deploy.yml | 4 ++-- .github/workflows/test.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index f83eda7462..bcd640b99b 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -16,7 +16,7 @@ jobs: continue-on-error: ${{ startsWith(github.event.ref,'refs/heads/') }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: fetch all tags # need annotated tags for release checklist run: | git fetch --force --tags --depth=1 @@ -38,7 +38,7 @@ jobs: CC: "gcc-8" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v4 with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2d1580c356..2e3a469195 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,7 +19,7 @@ jobs: PR_MILESTONE: "${{ github.event.pull_request.milestone.number }}" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Check if PR is assigned to a milestone if: ${{ github.event_name == 'pull_request' }} run: | @@ -37,7 +37,7 @@ jobs: CHANGELOG_ISSUE: ":issue:`${{ github.event.pull_request.number }}`" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Check if PR is mentioned in changelog if: ${{ always() }} run: | @@ -113,7 +113,7 @@ jobs: python-version: '3.11' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup environment run: | # Enable coverage for specific target configurations @@ -229,7 +229,7 @@ jobs: run: | python -m pip install --upgrade pip python3 -m pip install nox - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Build Docker run: | python3 -m nox --non-interactive --session "docker_build_compiler(${{ matrix.gcc }})" From 3d229f05e3d93e127862b356b10c3c8f62aad32c Mon Sep 17 00:00:00 2001 From: Spacetown <40258682+spacetown@users.noreply.github.com> Date: Sun, 4 Feb 2024 21:09:09 +0100 Subject: [PATCH 2/6] Update OS used for checks --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index bcd640b99b..ad05aa520f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -11,7 +11,7 @@ on: jobs: release-check: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 continue-on-error: ${{ startsWith(github.event.ref,'refs/heads/') }} @@ -29,7 +29,7 @@ jobs: admin/release_checklist $EXTRA_CHECKLIST_ARGS 7.0+main deploy: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 needs: release-check env: From 922890b3ff4b91626f84fffc59801f44dfc68a84 Mon Sep 17 00:00:00 2001 From: Spacetown <40258682+spacetown@users.noreply.github.com> Date: Sun, 4 Feb 2024 21:10:11 +0100 Subject: [PATCH 3/6] Update CHANGELOG --- CHANGELOG.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 19ca7b00dd..18bfb02090 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -19,6 +19,7 @@ Documentation: Internal changes: - Improve Dockerfile for faster rebuilds by using cache. (:issue:`878`) +- Fix deprecation warnings from GitHub actions. (:issue:`880`) 7.0 (25 January 2024) --------------------- From d6e3eb558a5f0a1f97ee7cc243267f5b1ff11434 Mon Sep 17 00:00:00 2001 From: Spacetown <40258682+spacetown@users.noreply.github.com> Date: Sun, 4 Feb 2024 21:20:02 +0100 Subject: [PATCH 4/6] Update gcc in deploy workflow --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index ad05aa520f..c0b3cd3333 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -35,7 +35,7 @@ jobs: env: FORCE_COLOR: "1" PYTHON_VERSION: "3.8" - CC: "gcc-8" + CC: "gcc-11" steps: - uses: actions/checkout@v4 From b6756da7622ce545ee3ed8a24a781e22de970910 Mon Sep 17 00:00:00 2001 From: Spacetown <40258682+spacetown@users.noreply.github.com> Date: Sun, 4 Feb 2024 21:41:28 +0100 Subject: [PATCH 5/6] Update more actions --- .github/workflows/deploy.yml | 4 ++-- .github/workflows/test.yml | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c0b3cd3333..c10b254b48 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -40,11 +40,11 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ env.PYTHON_VERSION }} - name: Cache pip - uses: actions/cache@v3 + uses: actions/cache@v4 with: # This path is specific to Ubuntu path: ~/.cache/pip diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2e3a469195..ef6ced2bb7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -150,11 +150,11 @@ jobs: libxml2-utils sudo apt-get clean - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Cache pip - uses: actions/cache@v3 + uses: actions/cache@v4 with: # This path is specific to Ubuntu path: ~/.cache/pip @@ -180,7 +180,7 @@ jobs: path: gcovr/tests/diff.zip - name: Upload coverage to Codecov if: ${{ env.USE_COVERAGE == 'true' }} - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: token: ${{ secrets.CODECOV_TOKEN }} env_vars: OS,PYTHON @@ -241,7 +241,7 @@ jobs: python3 -m nox --non-interactive --session "docker_run_compiler(${{ matrix.gcc }})" -- --session tests - name: Upload coverage to Codecov if: ${{ env.USE_COVERAGE == 'true' }} - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: token: ${{ secrets.CODECOV_TOKEN }} env_vars: OS,PYTHON @@ -251,7 +251,7 @@ jobs: verbose: true - name: Upload LCOV coverage to Codecov if: ${{ matrix.gcc == 'clang-13' }} - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: token: ${{ secrets.CODECOV_TOKEN }} env_vars: OS,PYTHON From a8ade8936e0eeb9578310ab1908aaf9bf0bcba9f Mon Sep 17 00:00:00 2001 From: Spacetown <40258682+spacetown@users.noreply.github.com> Date: Mon, 5 Feb 2024 16:57:25 +0100 Subject: [PATCH 6/6] Fix coverage upload --- .github/workflows/test.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ef6ced2bb7..31c512357b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -185,6 +185,8 @@ jobs: token: ${{ secrets.CODECOV_TOKEN }} env_vars: OS,PYTHON fail_ci_if_error: true + disable_search: true + plugins: pycoverage files: ./coverage.xml name: ${{ matrix.os }}-${{ matrix.gcc }} verbose: true @@ -246,16 +248,19 @@ jobs: token: ${{ secrets.CODECOV_TOKEN }} env_vars: OS,PYTHON fail_ci_if_error: true + disable_search: true + plugins: pycoverage files: ./coverage.xml name: docker-${{ matrix.gcc }} verbose: true - name: Upload LCOV coverage to Codecov - if: ${{ matrix.gcc == 'clang-13' }} + if: ${{ (matrix.gcc == 'gcc-5') || (matrix.gcc == 'clang-10') }} uses: codecov/codecov-action@v4 with: token: ${{ secrets.CODECOV_TOKEN }} env_vars: OS,PYTHON fail_ci_if_error: true + disable_search: true files: ./gcovr/tests/nested/reference/${{ matrix.gcc }}/coverage.lcov name: docker-${{ matrix.gcc }}-lcov verbose: true