Ubuntu 22.04 integration: GitHub workflows

- GitHub workflows are run on Ubuntu 22.04

- Extract the `checkstyle` workflow dependencies to a separate file.

- Refresh the `build-dependencies.txt` list.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Richard Yao <richard.yao@alumni.stonybrook.edu>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Signed-off-by: szubersk <szuberskidamian@gmail.com>
Closes #14148

diff --git a/.github/workflows/build-dependencies.txt b/.github/workflows/build-dependencies.txt
index e591399001f57a97e29cc794b4f59e849d49b811..482d82fff17c0e3401249092b8a34743804b719c 100644 (file)
--- a/.github/workflows/build-dependencies.txt
+++ b/.github/workflows/build-dependencies.txt
@@ -23,10 +23,11 @@ libelf-dev
 libffi-dev
 libmount-dev
 libpam0g-dev
-libselinux-dev
+libselinux1-dev
 libssl-dev
 libtool
 libudev-dev
+linux-headers-generic
 lsscsi
 mdadm
 nfs-kernel-server
@@ -36,8 +37,9 @@ python3
 python3-cffi
 python3-dev
 python3-packaging
+python3-pip
 python3-setuptools
-rng-tools
+rng-tools-debian
 rsync
 samba
 sysstat

diff --git a/.github/workflows/checkstyle-dependencies.txt b/.github/workflows/checkstyle-dependencies.txt
new file mode 100644 (file)
index 0000000..879d3db
--- /dev/null
+++ b/.github/workflows/checkstyle-dependencies.txt
@@ -0,0 +1,5 @@
+cppcheck
+devscripts
+mandoc
+pax-utils
+shellcheck

diff --git a/.github/workflows/checkstyle.yaml b/.github/workflows/checkstyle.yaml
index 2e593e0a566939ac06de7ca2d4e94ab1862c7d94..008adcc03e0bab7e4864f8af5de28bdbd66916e8 100644 (file)
--- a/.github/workflows/checkstyle.yaml
+++ b/.github/workflows/checkstyle.yaml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   checkstyle:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v3
       with:
@@ -14,8 +14,9 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt-get update
+        sudo apt-get -qq upgrade
         sudo xargs --arg-file=${{ github.workspace }}/.github/workflows/build-dependencies.txt apt-get install -qq
-        sudo apt-get install -qq mandoc cppcheck pax-utils devscripts
+        sudo xargs --arg-file=${{ github.workspace }}/.github/workflows/checkstyle-dependencies.txt apt-get install -qq
         sudo python3 -m pip install --quiet flake8
         sudo apt-get clean
 

diff --git a/.github/workflows/zfs-tests-functional.yml b/.github/workflows/zfs-tests-functional.yml
index 1c2b2b804064f7c5a347c092da2d2ac9335df931..236bf599f68a7c79521a9c3b144d1dbc22ae170c 100644 (file)
--- a/.github/workflows/zfs-tests-functional.yml
+++ b/.github/workflows/zfs-tests-functional.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [18.04, 20.04]
+        os: [18.04, 20.04, 22.04]
     runs-on: ubuntu-${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
@@ -21,7 +21,11 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt-get update
-        xargs --arg-file=${{ github.workspace }}/.github/workflows/build-dependencies.txt sudo apt-get install -qq
+        sudo apt-get -qq upgrade
+        if [ "${{ matrix.os }}" = "18.04" ]; then
+          sed -i.bak 's/rng-tools-debian/rng-tools/' ${{ github.workspace }}/.github/workflows/build-dependencies.txt
+        fi
+        sudo xargs --arg-file=${{ github.workspace }}/.github/workflows/build-dependencies.txt apt-get install -qq
         sudo apt-get clean
     - name: Autogen.sh
       run: |

diff --git a/.github/workflows/zfs-tests-sanity.yml b/.github/workflows/zfs-tests-sanity.yml
index ace046ad1c12b05615c121cc8d952deaf168f63a..f3fc607cb4fcc6534ebb8252b537bdfdb0260373 100644 (file)
--- a/.github/workflows/zfs-tests-sanity.yml
+++ b/.github/workflows/zfs-tests-sanity.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   tests:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v3
       with:
@@ -17,7 +17,8 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt-get update
-        xargs --arg-file=${{ github.workspace }}/.github/workflows/build-dependencies.txt sudo apt-get install -qq
+        sudo apt-get -qq upgrade
+        sudo xargs --arg-file=${{ github.workspace }}/.github/workflows/build-dependencies.txt apt-get install -qq
         sudo apt-get clean
     - name: Autogen.sh
       run: |

diff --git a/.github/workflows/zloop.yml b/.github/workflows/zloop.yml
index 807a1bc4612335c044f3decd907050770e95121d..1a234ac99402fa3af944f90e9b063684a9a04a71 100644 (file)
--- a/.github/workflows/zloop.yml
+++ b/.github/workflows/zloop.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   tests:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     env:
       TEST_DIR: /var/tmp/zloop
     steps:
@@ -16,7 +16,8 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt-get update
-        xargs --arg-file=${{ github.workspace }}/.github/workflows/build-dependencies.txt sudo apt-get install -qq
+        sudo apt-get -qq upgrade
+        sudo xargs --arg-file=${{ github.workspace }}/.github/workflows/build-dependencies.txt apt-get install -qq
         sudo apt-get clean
     - name: Autogen.sh
       run: |