Merge branch 'master' into fpgamatt/fix-openssl-version-check

OFS · Jan 16, 2025 · 878adff · 878adff
2 parents 08f264f + 1751ad8
commit 878adff
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 35 deletions.
diff --git a/.github/workflows/build-debs.yml b/.github/workflows/build-debs.yml
@@ -25,10 +25,10 @@ jobs:
     strategy:
       matrix:
         distro: [ubuntu22]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     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
@@ -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
@@ -25,10 +25,10 @@ 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@v3
+      - uses: actions/checkout@v4
       - name: Build Docker Image
         run: docker build . -f docker/${{ matrix.distro }}/Dockerfile -t opae-${{ matrix.distro }}
       - name: Build RPMs
@@ -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
@@ -41,12 +41,12 @@ on:
 
 jobs:
   coding-style:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       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
@@ -60,16 +60,18 @@ 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:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       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
@@ -91,9 +93,9 @@ 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@v3
+    - uses: actions/checkout@v4
     - name: bugfix
       run: sudo rm -f /var/cache/debconf/config.dat
     - name: disable_snap
@@ -118,9 +120,9 @@ 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@v3
+    - uses: actions/checkout@v4
     - name: update
       run: sudo apt-get update -y
     - name: Build Docker image
@@ -136,7 +138,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 +148,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/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
@@ -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
@@ -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
@@ -11,14 +11,14 @@ 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']
     steps:
-    - uses: actions/checkout@v3
+    - 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
@@ -15,17 +15,17 @@ on:
 
 jobs:
   analyze:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         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 }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
@@ -53,9 +53,9 @@ 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
+        name: python-static-analysis-${{ matrix.python-version }}
         path: |
           ${{ github.workspace }}/pylint.log
           ${{ github.workspace }}/flake8.log

diff --git a/.github/workflows/valgrind.yml b/.github/workflows/valgrind.yml
@@ -10,10 +10,10 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: update
       run: sudo apt-get update -y
     - name: upgrade
@@ -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
diff --git 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 $?