Skip to content

Commit

Permalink
Ubuntu 22.04 integration: GitHub workflows
Browse files Browse the repository at this point in the history
- 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 openzfs#14148
  • Loading branch information
szubersk authored and andrewc12 committed Nov 19, 2022
1 parent 2c15d99 commit 57280a0
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 10 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/build-dependencies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -36,8 +37,9 @@ python3
python3-cffi
python3-dev
python3-packaging
python3-pip
python3-setuptools
rng-tools
rng-tools-debian
rsync
samba
sysstat
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/checkstyle-dependencies.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
cppcheck
devscripts
mandoc
pax-utils
shellcheck
5 changes: 3 additions & 2 deletions .github/workflows/checkstyle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,17 @@ on:

jobs:
checkstyle:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha }}
- 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
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/zfs-tests-functional.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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: |
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/zfs-tests-sanity.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
tests:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
with:
Expand All @@ -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: |
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/zloop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
tests:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
env:
TEST_DIR: /var/tmp/zloop
steps:
Expand All @@ -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: |
Expand Down

0 comments on commit 57280a0

Please sign in to comment.