ci: line-wrap and split/join some commands

For increased readability.

Note: `>` basically turns each newline into a space while `|` keeps
newlines as is.  Both remove leading indentation.

Note2: On jobs using `apt-get install`, this commit moves package names
to their own line, to make it easier to compare which packages are being
installed across such jobs.
This commit is contained in:
Kelvin M. Klann 2023-04-10 20:36:31 -03:00
parent b9885cd5a7
commit fd59df07de
4 changed files with 61 additions and 21 deletions

View file

@ -68,7 +68,9 @@ jobs:
- name: install dependencies
run: sudo apt-get install libapparmor-dev libselinux1-dev
- name: configure
run: CC=clang-14 ./configure --enable-fatal-warnings --enable-apparmor --enable-selinux
run: >
CC=clang-14 ./configure --enable-fatal-warnings --enable-apparmor
--enable-selinux
- name: make
run: make
- name: make install
@ -91,7 +93,9 @@ jobs:
- name: install clang-tools-14 and dependencies
run: sudo apt-get install clang-tools-14 libapparmor-dev libselinux1-dev
- name: configure
run: CC=clang-14 ./configure --enable-fatal-warnings --enable-apparmor --enable-selinux
run: >
CC=clang-14 ./configure --enable-fatal-warnings --enable-apparmor
--enable-selinux
- name: scan-build
run: NO_EXTRA_CFLAGS="yes" scan-build-14 --status-bugs make
cppcheck:
@ -110,9 +114,11 @@ jobs:
- name: install cppcheck
run: sudo apt-get install cppcheck
- name: cppcheck
run: cppcheck -q --force --error-exitcode=1 --enable=warning,performance -i src/firejail/checkcfg.c -i src/firejail/main.c .
# new cppcheck version currently chokes on checkcfg.c and main.c, therefore scan all files also
# with older cppcheck version from ubuntu 20.04.
run: >
cppcheck -q --force --error-exitcode=1 --enable=warning,performance
-i src/firejail/checkcfg.c -i src/firejail/main.c .
# new cppcheck version currently chokes on checkcfg.c and main.c, therefore
# scan all files also with older cppcheck version from ubuntu 20.04.
cppcheck_old:
runs-on: ubuntu-20.04
steps:

View file

@ -64,9 +64,14 @@ jobs:
- name: update package information
run: sudo apt-get update
- name: install dependencies
run: sudo apt-get install gcc-12 libapparmor-dev libselinux1-dev expect xzdec whois bridge-utils
run: >
sudo apt-get install
gcc-12 libapparmor-dev libselinux1-dev expect xzdec whois
bridge-utils
- name: configure
run: CC=gcc-12 ./configure --prefix=/usr --enable-fatal-warnings --enable-analyzer --enable-apparmor --enable-selinux
run: >
CC=gcc-12 ./configure --prefix=/usr --enable-fatal-warnings
--enable-analyzer --enable-apparmor --enable-selinux
- name: make
run: make
- name: make install

View file

@ -35,11 +35,19 @@ jobs:
- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
# - name: sort.py
# run: ./ci/check/profiles/sort.py etc/inc/*.inc etc/{profile-a-l,profile-m-z}/*.profile
# run: >
# ./ci/check/profiles/sort.py
# etc/inc/*.inc etc/{profile-a-l,profile-m-z}/*.profile
# Currently broken (see #5610)
# - name: private-etc-always-required.sh
# run: ./ci/check/profiles/private-etc-always-required.sh etc/inc/*.inc etc/{profile-a-l,profile-m-z}/*.profile
# - name: private-etc-always-required.sh
# run: >
# ./ci/check/profiles/private-etc-always-required.sh
# etc/inc/*.inc etc/{profile-a-l,profile-m-z}/*.profile
- name: sort-disable-programs.sh
run: ./ci/check/profiles/sort-disable-programs.sh etc/inc/disable-programs.inc
run: >
./ci/check/profiles/sort-disable-programs.sh
etc/inc/disable-programs.inc
- name: sort-firecfg.config.sh
run: ./ci/check/profiles/sort-firecfg.config.sh src/firecfg/firecfg.config
run: >
./ci/check/profiles/sort-firecfg.config.sh
src/firecfg/firecfg.config