From b7af32267e554319b2bf25e47287eae7acaab639 Mon Sep 17 00:00:00 2001 From: Peter Colberg Date: Thu, 16 Jan 2025 14:12:06 -0500 Subject: [PATCH 1/7] .github/workflows: bump actions/checkout version Signed-off-by: Peter Colberg --- .github/workflows/build-debs.yml | 2 +- .github/workflows/build-rpms.yml | 2 +- .github/workflows/ccpp-tests.yml | 8 ++++---- .github/workflows/pacsign.yml | 2 +- .github/workflows/python-static-analysis.yml | 2 +- .github/workflows/valgrind.yml | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-debs.yml b/.github/workflows/build-debs.yml index aa7ac4b980ef..f9fdf9246f80 100644 --- a/.github/workflows/build-debs.yml +++ b/.github/workflows/build-debs.yml @@ -28,7 +28,7 @@ jobs: runs-on: ubuntu-latest name: Build ${{ matrix.distro }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Build Docker Image run: docker build . -f docker/${{ matrix.distro }}/Dockerfile -t opae-${{ matrix.distro }} - name: Build DEBs diff --git a/.github/workflows/build-rpms.yml b/.github/workflows/build-rpms.yml index 35bcf631d6d7..bf157fa19d09 100644 --- a/.github/workflows/build-rpms.yml +++ b/.github/workflows/build-rpms.yml @@ -28,7 +28,7 @@ jobs: runs-on: ubuntu-latest name: Build ${{ matrix.distro }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Build Docker Image run: docker build . -f docker/${{ matrix.distro }}/Dockerfile -t opae-${{ matrix.distro }} - name: Build RPMs diff --git a/.github/workflows/ccpp-tests.yml b/.github/workflows/ccpp-tests.yml index 481a4a98b985..d81c23899f69 100644 --- a/.github/workflows/ccpp-tests.yml +++ b/.github/workflows/ccpp-tests.yml @@ -46,7 +46,7 @@ jobs: matrix: lang-type: [c, cpp] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: bugfix run: sudo rm -f /var/cache/debconf/config.dat - name: disable_snap @@ -69,7 +69,7 @@ jobs: matrix: build-type: [Debug, Release, RelWithDebInfo] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: bugfix run: sudo rm -f /var/cache/debconf/config.dat - name: disable_snap @@ -93,7 +93,7 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: bugfix run: sudo rm -f /var/cache/debconf/config.dat - name: disable_snap @@ -120,7 +120,7 @@ jobs: build-doc: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: update run: sudo apt-get update -y - name: Build Docker image diff --git a/.github/workflows/pacsign.yml b/.github/workflows/pacsign.yml index f82426913d0b..3279a8b72d73 100644 --- a/.github/workflows/pacsign.yml +++ b/.github/workflows/pacsign.yml @@ -16,7 +16,7 @@ jobs: matrix: python-version: ['3.8', '3.9', '3.10', '3.11'] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: diff --git a/.github/workflows/python-static-analysis.yml b/.github/workflows/python-static-analysis.yml index 9216ad5ea284..926b1895be6a 100644 --- a/.github/workflows/python-static-analysis.yml +++ b/.github/workflows/python-static-analysis.yml @@ -21,7 +21,7 @@ jobs: python-version: ['3.8', '3.9', '3.10', '3.11'] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Update run: sudo apt-get update -y - name: Setup python${{ matrix.python-version }} diff --git a/.github/workflows/valgrind.yml b/.github/workflows/valgrind.yml index 626520850453..fceb7ca509ef 100644 --- a/.github/workflows/valgrind.yml +++ b/.github/workflows/valgrind.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: update run: sudo apt-get update -y - name: upgrade From 458d68e7f5d1228151340349f6a9e21919b91552 Mon Sep 17 00:00:00 2001 From: Peter Colberg Date: Thu, 16 Jan 2025 14:12:41 -0500 Subject: [PATCH 2/7] .github/workflows: bump actions/upload-artifact version Signed-off-by: Peter Colberg --- .github/workflows/build-debs.yml | 2 +- .github/workflows/build-rpms.yml | 2 +- .github/workflows/ccpp-tests.yml | 4 ++-- .github/workflows/python-static-analysis.yml | 2 +- .github/workflows/valgrind.yml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-debs.yml b/.github/workflows/build-debs.yml index f9fdf9246f80..2a56418277ef 100644 --- a/.github/workflows/build-debs.yml +++ b/.github/workflows/build-debs.yml @@ -40,7 +40,7 @@ jobs: docker run --rm -v ${{ github.workspace }}:/opae-${{ matrix.distro }}/opae-sdk --workdir /opae-${{ matrix.distro }}/opae-sdk --entrypoint /bin/bash opae-${{ matrix.distro }} -c "/scripts/test-debs.sh" - name: Upload Artifact if: ${{ github.event_name != 'pull_request'}} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: OPAE-${{ matrix.distro }} path: diff --git a/.github/workflows/build-rpms.yml b/.github/workflows/build-rpms.yml index bf157fa19d09..7975e403246e 100644 --- a/.github/workflows/build-rpms.yml +++ b/.github/workflows/build-rpms.yml @@ -40,7 +40,7 @@ jobs: docker run --rm -v ${{ github.workspace }}:/opae-${{ matrix.distro }}/opae-sdk --workdir /opae-${{ matrix.distro }}/opae-sdk --entrypoint /bin/bash opae-${{ matrix.distro }} -c "/scripts/test-rpms.sh" - name: Upload Artifact if: ${{ github.event_name != 'pull_request'}} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: OPAE-${{ matrix.distro }} path: diff --git a/.github/workflows/ccpp-tests.yml b/.github/workflows/ccpp-tests.yml index d81c23899f69..a0597dda0c0b 100644 --- a/.github/workflows/ccpp-tests.yml +++ b/.github/workflows/ccpp-tests.yml @@ -136,7 +136,7 @@ jobs: working-directory: ${{ github.workspace }}/mybuild_docs run: ${{ github.workspace }}/scripts/push-documentation.sh "${GITHUB_TAG##*/}" - name: Archive html docs - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: docs path: mybuild_docs/sphinx/html @@ -146,7 +146,7 @@ jobs: args: --verbose --no-progress mybuild_docs/sphinx/html output: ${{ github.workspace }}/lychee - name: Archive lychee results - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: link-checker path: ${{ github.workspace }}/lychee diff --git a/.github/workflows/python-static-analysis.yml b/.github/workflows/python-static-analysis.yml index 926b1895be6a..bc9a67c701dc 100644 --- a/.github/workflows/python-static-analysis.yml +++ b/.github/workflows/python-static-analysis.yml @@ -53,7 +53,7 @@ jobs: --format csv \ | tee ${{ github.workspace }}/bandit.log.csv - name: Archive results - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: static-analysis path: | diff --git a/.github/workflows/valgrind.yml b/.github/workflows/valgrind.yml index fceb7ca509ef..3db2f402669a 100644 --- a/.github/workflows/valgrind.yml +++ b/.github/workflows/valgrind.yml @@ -33,7 +33,7 @@ jobs: OPAE_EXPLICIT_INITIALIZE: 1 LD_LIBRARY_PATH: ${{ github.workspace }}/.build/lib - name: Archive Results - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: valgrind path: ${{ github.workspace }}/.build/valgrind From bb6ed1e42f59ed2cb73fbbe845308d123b4c04cb Mon Sep 17 00:00:00 2001 From: Peter Colberg Date: Thu, 16 Jan 2025 14:14:03 -0500 Subject: [PATCH 3/7] .github/workflows: bump actions/setup-python version Signed-off-by: Peter Colberg --- .github/workflows/pacsign.yml | 2 +- .github/workflows/python-static-analysis.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pacsign.yml b/.github/workflows/pacsign.yml index 3279a8b72d73..19d51bdf95b0 100644 --- a/.github/workflows/pacsign.yml +++ b/.github/workflows/pacsign.yml @@ -18,7 +18,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/python-static-analysis.yml b/.github/workflows/python-static-analysis.yml index bc9a67c701dc..0d45388a3efb 100644 --- a/.github/workflows/python-static-analysis.yml +++ b/.github/workflows/python-static-analysis.yml @@ -25,7 +25,7 @@ jobs: - name: Update run: sudo apt-get update -y - name: Setup python${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install dependencies From c0c44832f6ad2b8023675f6ca5b79bdebf8ca979 Mon Sep 17 00:00:00 2001 From: Peter Colberg Date: Thu, 16 Jan 2025 14:20:34 -0500 Subject: [PATCH 4/7] .github/workflows: avoid conflicting artifact name in job matrix Reuse of the same artifact name is unsupported in upload-artifact@v4. Signed-off-by: Peter Colberg --- .github/workflows/python-static-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-static-analysis.yml b/.github/workflows/python-static-analysis.yml index 0d45388a3efb..7ddd25db2610 100644 --- a/.github/workflows/python-static-analysis.yml +++ b/.github/workflows/python-static-analysis.yml @@ -55,7 +55,7 @@ jobs: - name: Archive results uses: actions/upload-artifact@v4 with: - name: static-analysis + name: python-static-analysis-${{ matrix.python-version }} path: | ${{ github.workspace }}/pylint.log ${{ github.workspace }}/flake8.log From 10bc7c43be4aac6bd0b89dd2b9b776bdd4b837ca Mon Sep 17 00:00:00 2001 From: Peter Colberg Date: Thu, 16 Jan 2025 16:34:25 -0500 Subject: [PATCH 5/7] scripts: do not silence coverage error output Signed-off-by: Peter Colberg --- scripts/cover.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/cover.sh b/scripts/cover.sh index 607a1529758a..66008d6d953e 100755 --- a/scripts/cover.sh +++ b/scripts/cover.sh @@ -20,7 +20,7 @@ rm -rf coverage_files/* make -j $(nproc) lcov --directory . --zerocounters -lcov -c -i -d . -o coverage.base 2> /dev/null +lcov -c -i -d . -o coverage.base LD_LIBRARY_PATH=${PWD}/lib \ CTEST_OUTPUT_ON_FAILURE=1 \ @@ -29,7 +29,7 @@ ctest --timeout 180 find . \( -iname "*.gcda" -or -iname "*.gcno" \) -exec chmod 664 '{}' \; -lcov --directory . --capture --output-file coverage.info 2> /dev/null +lcov --directory . --capture --output-file coverage.info lcov -a coverage.base -a coverage.info --output-file coverage.total lcov --remove coverage.total \ @@ -48,5 +48,5 @@ lcov --remove coverage.total \ '*samples/n5010-test/**' \ --output-file coverage.info.cleaned -genhtml --function-coverage -o coverage_report coverage.info.cleaned 2> /dev/null +genhtml --function-coverage -o coverage_report coverage.info.cleaned exit $? From 4fd485b2f5ebc338a6c055080f15984721e7fa27 Mon Sep 17 00:00:00 2001 From: Peter Colberg Date: Thu, 16 Jan 2025 17:03:13 -0500 Subject: [PATCH 6/7] .github/workflows: set runner OS to Ubuntu 22.04 The GitHub hosted runners now default to Ubuntu 24.04, which results in multiple, smaller failures in the C/C++ build and test workflow. Signed-off-by: Peter Colberg --- .github/workflows/build-debs.yml | 2 +- .github/workflows/build-rpms.yml | 2 +- .github/workflows/ccpp-tests.yml | 8 ++++---- .github/workflows/docker-rpm.yml | 2 +- .github/workflows/no-ccpp-tests.yml | 4 ++-- .github/workflows/no-python-analysis.yml | 2 +- .github/workflows/pacsign.yml | 2 +- .github/workflows/python-static-analysis.yml | 2 +- .github/workflows/valgrind.yml | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build-debs.yml b/.github/workflows/build-debs.yml index 2a56418277ef..0e8db0de3403 100644 --- a/.github/workflows/build-debs.yml +++ b/.github/workflows/build-debs.yml @@ -25,7 +25,7 @@ jobs: strategy: matrix: distro: [ubuntu22] - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 name: Build ${{ matrix.distro }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/build-rpms.yml b/.github/workflows/build-rpms.yml index 7975e403246e..685d694871f9 100644 --- a/.github/workflows/build-rpms.yml +++ b/.github/workflows/build-rpms.yml @@ -25,7 +25,7 @@ jobs: strategy: matrix: distro: [fedora39, fedora40, rockylinux8, rockylinux9] - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 name: Build ${{ matrix.distro }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/ccpp-tests.yml b/.github/workflows/ccpp-tests.yml index a0597dda0c0b..67bca8511ad5 100644 --- a/.github/workflows/ccpp-tests.yml +++ b/.github/workflows/ccpp-tests.yml @@ -41,7 +41,7 @@ on: jobs: coding-style: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 strategy: matrix: lang-type: [c, cpp] @@ -64,7 +64,7 @@ jobs: - name: test ${{ matrix.lang-type }} run: ${{ github.workspace }}/scripts/test-codingstyle-all.sh ${{ matrix.lang-type }} build: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 strategy: matrix: build-type: [Debug, Release, RelWithDebInfo] @@ -91,7 +91,7 @@ jobs: - name: make ${{ matrix.build-type }} run: cd ${{ github.workspace }}/.build && make -j $(nproc) test: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - name: bugfix @@ -118,7 +118,7 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} path-to-lcov: unittests/coverage.info.cleaned build-doc: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - name: update diff --git a/.github/workflows/docker-rpm.yml b/.github/workflows/docker-rpm.yml index a46565888984..552f48838ac7 100644 --- a/.github/workflows/docker-rpm.yml +++ b/.github/workflows/docker-rpm.yml @@ -14,7 +14,7 @@ on: - .github/workflows/docker-rpm.yml jobs: build_docker_image: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 - name: Build a Docker image and RPM file diff --git a/.github/workflows/no-ccpp-tests.yml b/.github/workflows/no-ccpp-tests.yml index a3595d6c356e..9e18954359f3 100644 --- a/.github/workflows/no-ccpp-tests.yml +++ b/.github/workflows/no-ccpp-tests.yml @@ -10,13 +10,13 @@ on: pull_request: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 strategy: matrix: build-type: [Debug, Release, RelWithDebInfo] steps: - run: exit 0 test: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - run: exit 0 diff --git a/.github/workflows/no-python-analysis.yml b/.github/workflows/no-python-analysis.yml index f460a3036dd8..01cd2b7983b2 100644 --- a/.github/workflows/no-python-analysis.yml +++ b/.github/workflows/no-python-analysis.yml @@ -11,7 +11,7 @@ on: jobs: analyze: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 strategy: matrix: python-version: ['3.8', '3.9', '3.10', '3.11'] diff --git a/.github/workflows/pacsign.yml b/.github/workflows/pacsign.yml index 19d51bdf95b0..87aeee3a2b21 100644 --- a/.github/workflows/pacsign.yml +++ b/.github/workflows/pacsign.yml @@ -11,7 +11,7 @@ on: - '.github/workflows/pacsign.yml' jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 strategy: matrix: python-version: ['3.8', '3.9', '3.10', '3.11'] diff --git a/.github/workflows/python-static-analysis.yml b/.github/workflows/python-static-analysis.yml index 7ddd25db2610..072916312aec 100644 --- a/.github/workflows/python-static-analysis.yml +++ b/.github/workflows/python-static-analysis.yml @@ -15,7 +15,7 @@ on: jobs: analyze: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 strategy: matrix: python-version: ['3.8', '3.9', '3.10', '3.11'] diff --git a/.github/workflows/valgrind.yml b/.github/workflows/valgrind.yml index 3db2f402669a..f5b2ee0720b1 100644 --- a/.github/workflows/valgrind.yml +++ b/.github/workflows/valgrind.yml @@ -10,7 +10,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 From 1751ad8239b494095668b950693fbfdf6789fca5 Mon Sep 17 00:00:00 2001 From: Peter Colberg Date: Thu, 16 Jan 2025 17:22:21 -0500 Subject: [PATCH 7/7] .github/workflows: use locally installed checkpatch.pl checkpatch.pl may fail to download with HTTP 429 Too Many Requests. Signed-off-by: Peter Colberg --- .github/workflows/ccpp-tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ccpp-tests.yml b/.github/workflows/ccpp-tests.yml index 67bca8511ad5..b311853f8da8 100644 --- a/.github/workflows/ccpp-tests.yml +++ b/.github/workflows/ccpp-tests.yml @@ -60,7 +60,9 @@ jobs: - name: upgrade run: sudo -E DEBIAN_FRONTEND=noninteractive apt-get upgrade -y - name: install - run: sudo -E DEBIAN_FRONTEND=noninteractive apt-get install -y clang-format + run: | + sudo -E DEBIAN_FRONTEND=noninteractive apt-get install -y clang-format linux-headers-generic + install -t ${{ github.workspace }}/scripts /usr/src/linux-headers-*-generic/scripts/checkpatch.pl - name: test ${{ matrix.lang-type }} run: ${{ github.workspace }}/scripts/test-codingstyle-all.sh ${{ matrix.lang-type }} build: