diff options
| author |  Kelvin M. Klann <kmk3.code@protonmail.com> | 2023-06-18 14:24:52 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-06-18 14:24:52 +0000 |
| commit | 3ad7f9466d649bdd003ab122761c61fea0090d0d (patch) | |
| tree | 7f7a4643ae4699f6a4f3c3d1ef6550273b506b34 /.github | |
| parent | Merge pull request #5850 from kmk3/vim-improve-ftdetect (diff) | |
| parent | ci: standardize apt-get update/install (diff) | |
| download | firejail-3ad7f9466d649bdd003ab122761c61fea0090d0d.tar.gz firejail-3ad7f9466d649bdd003ab122761c61fea0090d0d.tar.zst firejail-3ad7f9466d649bdd003ab122761c61fea0090d0d.zip | |
Merge pull request #5857 from kmk3/ci-standardize-apt
ci: standardize apt-get update/install & misc improvements
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build-extra.yml | 26 | ||||
| -rw-r--r-- | .github/workflows/build.yml | 5 |
2 files changed, 19 insertions, 12 deletions
diff --git a/.github/workflows/build-extra.yml b/.github/workflows/build-extra.yml index c812e4572..e32f827e1 100644 --- a/.github/workflows/build-extra.yml +++ b/.github/workflows/build-extra.yml | |||
| @@ -62,15 +62,18 @@ jobs: | |||
| 62 | github.com:443 | 62 | github.com:443 |
| 63 | - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab | 63 | - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab |
| 64 | - name: update package information | 64 | - name: update package information |
| 65 | run: sudo apt-get update | 65 | run: sudo apt-get update -qy |
| 66 | - name: install dependencies | 66 | - name: install dependencies |
| 67 | run: sudo apt-get install libapparmor-dev libselinux1-dev | 67 | run: > |
| 68 | sudo apt-get install -qy | ||
| 69 | libapparmor-dev libselinux1-dev | ||
| 68 | - name: print env | 70 | - name: print env |
| 69 | run: ./ci/printenv.sh | 71 | run: ./ci/printenv.sh |
| 70 | - name: configure | 72 | - name: configure |
| 71 | run: > | 73 | run: > |
| 72 | CC=clang-14 ./configure --enable-fatal-warnings --enable-apparmor | 74 | CC=clang-14 ./configure --enable-fatal-warnings --enable-apparmor |
| 73 | --enable-selinux | 75 | --enable-selinux |
| 76 | || (cat config.log; exit 1) | ||
| 74 | - name: make | 77 | - name: make |
| 75 | run: make | 78 | run: make |
| 76 | - name: make install | 79 | - name: make install |
| @@ -89,15 +92,18 @@ jobs: | |||
| 89 | github.com:443 | 92 | github.com:443 |
| 90 | - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab | 93 | - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab |
| 91 | - name: update package information | 94 | - name: update package information |
| 92 | run: sudo apt-get update | 95 | run: sudo apt-get update -qy |
| 93 | - name: install clang-tools-14 and dependencies | 96 | - name: install clang-tools-14 and dependencies |
| 94 | run: sudo apt-get install clang-tools-14 libapparmor-dev libselinux1-dev | 97 | run: > |
| 98 | sudo apt-get install -qy | ||
| 99 | clang-tools-14 libapparmor-dev libselinux1-dev | ||
| 95 | - name: print env | 100 | - name: print env |
| 96 | run: ./ci/printenv.sh | 101 | run: ./ci/printenv.sh |
| 97 | - name: configure | 102 | - name: configure |
| 98 | run: > | 103 | run: > |
| 99 | CC=clang-14 ./configure --enable-fatal-warnings --enable-apparmor | 104 | CC=clang-14 ./configure --enable-fatal-warnings --enable-apparmor |
| 100 | --enable-selinux | 105 | --enable-selinux |
| 106 | || (cat config.log; exit 1) | ||
| 101 | - name: scan-build | 107 | - name: scan-build |
| 102 | run: NO_EXTRA_CFLAGS="yes" scan-build-14 --status-bugs make | 108 | run: NO_EXTRA_CFLAGS="yes" scan-build-14 --status-bugs make |
| 103 | cppcheck: | 109 | cppcheck: |
| @@ -112,9 +118,9 @@ jobs: | |||
| 112 | github.com:443 | 118 | github.com:443 |
| 113 | - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab | 119 | - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab |
| 114 | - name: update package information | 120 | - name: update package information |
| 115 | run: sudo apt-get update | 121 | run: sudo apt-get update -qy |
| 116 | - name: install cppcheck | 122 | - name: install cppcheck |
| 117 | run: sudo apt-get install cppcheck | 123 | run: sudo apt-get install -qy cppcheck |
| 118 | - run: cppcheck --version | 124 | - run: cppcheck --version |
| 119 | - name: cppcheck | 125 | - name: cppcheck |
| 120 | run: > | 126 | run: > |
| @@ -134,9 +140,9 @@ jobs: | |||
| 134 | github.com:443 | 140 | github.com:443 |
| 135 | - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab | 141 | - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab |
| 136 | - name: update package information | 142 | - name: update package information |
| 137 | run: sudo apt-get update | 143 | run: sudo apt-get update -qy |
| 138 | - name: install cppcheck | 144 | - name: install cppcheck |
| 139 | run: sudo apt-get install cppcheck | 145 | run: sudo apt-get install -qy cppcheck |
| 140 | - run: cppcheck --version | 146 | - run: cppcheck --version |
| 141 | - name: cppcheck | 147 | - name: cppcheck |
| 142 | run: cppcheck -q --force --error-exitcode=1 --enable=warning,performance . | 148 | run: cppcheck -q --force --error-exitcode=1 --enable=warning,performance . |
| @@ -152,9 +158,9 @@ jobs: | |||
| 152 | github.com:443 | 158 | github.com:443 |
| 153 | - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab | 159 | - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab |
| 154 | - name: update package information | 160 | - name: update package information |
| 155 | run: sudo apt-get update | 161 | run: sudo apt-get update -qy |
| 156 | - name: install dependencies | 162 | - name: install dependencies |
| 157 | run: sudo apt-get install codespell | 163 | run: sudo apt-get install -qy codespell |
| 158 | - run: codespell --version | 164 | - run: codespell --version |
| 159 | - name: codespell | 165 | - name: codespell |
| 160 | run: make codespell | 166 | run: make codespell |
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e896ba8e0..ea85e1109 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml | |||
| @@ -63,10 +63,10 @@ jobs: | |||
| 63 | yahoo.com:1025 | 63 | yahoo.com:1025 |
| 64 | - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab | 64 | - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab |
| 65 | - name: update package information | 65 | - name: update package information |
| 66 | run: sudo apt-get update | 66 | run: sudo apt-get update -qy |
| 67 | - name: install dependencies | 67 | - name: install dependencies |
| 68 | run: > | 68 | run: > |
| 69 | sudo apt-get install | 69 | sudo apt-get install -qy |
| 70 | gcc-12 libapparmor-dev libselinux1-dev expect xzdec whois | 70 | gcc-12 libapparmor-dev libselinux1-dev expect xzdec whois |
| 71 | bridge-utils | 71 | bridge-utils |
| 72 | - name: print env | 72 | - name: print env |
| @@ -75,6 +75,7 @@ jobs: | |||
| 75 | run: > | 75 | run: > |
| 76 | CC=gcc-12 ./configure --prefix=/usr --enable-fatal-warnings | 76 | CC=gcc-12 ./configure --prefix=/usr --enable-fatal-warnings |
| 77 | --enable-analyzer --enable-apparmor --enable-selinux | 77 | --enable-analyzer --enable-apparmor --enable-selinux |
| 78 | || (cat config.log; exit 1) | ||
| 78 | - name: make | 79 | - name: make |
| 79 | run: make | 80 | run: make |
| 80 | - name: make install | 81 | - name: make install |