aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2023-04-22 18:10:05 -0300
committerLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2023-04-28 04:45:57 -0300
commit339d395fbdceabc6b8f70116823abcae5e1e18d5 (patch)
treeb689c484862fa103db6f3484f21cb54ec60077bf
parentci: print some program versions (diff)
downloadfirejail-339d395fb.tar.gz
firejail-339d395fb.tar.zst
firejail-339d395fb.zip
ci: print env-related settings in each job
To make debugging easier. Use a separate shell script instead of just a make target to ensure that it can safely run before ./configure and without having make installed.
-rw-r--r--.github/workflows/build-extra.yml4
-rw-r--r--.github/workflows/build.yml2
-rw-r--r--.github/workflows/codeql-analysis.yml3
-rw-r--r--.github/workflows/profile-checks.yml3
-rw-r--r--.gitlab-ci.yml7
-rw-r--r--Makefile4
-rwxr-xr-xci/printenv.sh25
7 files changed, 48 insertions, 0 deletions
diff --git a/.github/workflows/build-extra.yml b/.github/workflows/build-extra.yml
index d11c10718..04023ab45 100644
--- a/.github/workflows/build-extra.yml
+++ b/.github/workflows/build-extra.yml
@@ -67,6 +67,8 @@ jobs:
67 run: sudo apt-get update 67 run: sudo apt-get update
68 - name: install dependencies 68 - name: install dependencies
69 run: sudo apt-get install libapparmor-dev libselinux1-dev 69 run: sudo apt-get install libapparmor-dev libselinux1-dev
70 - name: print env
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
@@ -92,6 +94,8 @@ jobs:
92 run: sudo apt-get update 94 run: sudo apt-get update
93 - name: install clang-tools-14 and dependencies 95 - name: install clang-tools-14 and dependencies
94 run: sudo apt-get install clang-tools-14 libapparmor-dev libselinux1-dev 96 run: sudo apt-get install clang-tools-14 libapparmor-dev libselinux1-dev
97 - name: print env
98 run: ./ci/printenv.sh
95 - name: configure 99 - name: configure
96 run: > 100 run: >
97 CC=clang-14 ./configure --enable-fatal-warnings --enable-apparmor 101 CC=clang-14 ./configure --enable-fatal-warnings --enable-apparmor
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4af788044..b72bdd611 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -68,6 +68,8 @@ jobs:
68 sudo apt-get install 68 sudo apt-get install
69 gcc-12 libapparmor-dev libselinux1-dev expect xzdec whois 69 gcc-12 libapparmor-dev libselinux1-dev expect xzdec whois
70 bridge-utils 70 bridge-utils
71 - name: print env
72 run: ./ci/printenv.sh
71 - name: configure 73 - name: configure
72 run: > 74 run: >
73 CC=gcc-12 ./configure --prefix=/usr --enable-fatal-warnings 75 CC=gcc-12 ./configure --prefix=/usr --enable-fatal-warnings
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 952185b8a..e1353aa86 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -91,6 +91,9 @@ jobs:
91 - name: Checkout repository 91 - name: Checkout repository
92 uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab 92 uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
93 93
94 - name: print env
95 run: ./ci/printenv.sh
96
94 # Initializes the CodeQL tools for scanning. 97 # Initializes the CodeQL tools for scanning.
95 - name: Initialize CodeQL 98 - name: Initialize CodeQL
96 uses: github/codeql-action/init@b2c19fb9a2a485599ccf4ed5d65527d94bc57226 99 uses: github/codeql-action/init@b2c19fb9a2a485599ccf4ed5d65527d94bc57226
diff --git a/.github/workflows/profile-checks.yml b/.github/workflows/profile-checks.yml
index fc23f5fa1..9d9e67fe6 100644
--- a/.github/workflows/profile-checks.yml
+++ b/.github/workflows/profile-checks.yml
@@ -34,7 +34,10 @@ jobs:
34 github.com:443 34 github.com:443
35 35
36 - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab 36 - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
37 - name: print env
38 run: ./ci/printenv.sh
37 - run: python3 --version 39 - run: python3 --version
40
38# - name: sort.py 41# - name: sort.py
39# run: > 42# run: >
40# ./ci/check/profiles/sort.py 43# ./ci/check/profiles/sort.py
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9500415a1..8229c6575 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,6 +13,7 @@ build_ubuntu_package:
13 - > 13 - >
14 DEBIAN_FRONTEND=noninteractive apt-get install -y -qq 14 DEBIAN_FRONTEND=noninteractive apt-get install -y -qq
15 build-essential lintian libapparmor-dev pkg-config python3 gawk 15 build-essential lintian libapparmor-dev pkg-config python3 gawk
16 - ./ci/printenv.sh
16 - ./configure 17 - ./configure
17 - make deb 18 - make deb
18 - dpkg -i firejail*.deb 19 - dpkg -i firejail*.deb
@@ -27,6 +28,7 @@ build_debian_package:
27 - > 28 - >
28 apt-get install -y -qq 29 apt-get install -y -qq
29 build-essential lintian libapparmor-dev pkg-config gawk 30 build-essential lintian libapparmor-dev pkg-config gawk
31 - ./ci/printenv.sh
30 - ./configure 32 - ./configure
31 - make deb 33 - make deb
32 - dpkg -i firejail*.deb 34 - dpkg -i firejail*.deb
@@ -37,6 +39,7 @@ build_redhat_package:
37 script: 39 script:
38 - dnf update -y 40 - dnf update -y
39 - dnf install -y rpm-build gcc make 41 - dnf install -y rpm-build gcc make
42 - ./ci/printenv.sh
40 - ./configure --prefix=/usr 43 - ./configure --prefix=/usr
41 - make rpms 44 - make rpms
42 - rpm -i firejail*.rpm 45 - rpm -i firejail*.rpm
@@ -47,6 +50,7 @@ build_fedora_package:
47 script: 50 script:
48 - dnf update -y 51 - dnf update -y
49 - dnf install -y rpm-build gcc make 52 - dnf install -y rpm-build gcc make
53 - ./ci/printenv.sh
50 - ./configure --prefix=/usr 54 - ./configure --prefix=/usr
51 - make rpms 55 - make rpms
52 - rpm -i firejail*.rpm 56 - rpm -i firejail*.rpm
@@ -60,6 +64,7 @@ build_src_package:
60 - apk update 64 - apk update
61 - apk upgrade 65 - apk upgrade
62 - apk add build-base linux-headers python3 gawk 66 - apk add build-base linux-headers python3 gawk
67 - ./ci/printenv.sh
63 - ./configure --prefix=/usr 68 - ./configure --prefix=/usr
64 - make 69 - make
65 - make install-strip 70 - make install-strip
@@ -74,6 +79,7 @@ build_no_apparmor:
74 - > 79 - >
75 DEBIAN_FRONTEND=noninteractive apt-get install -y -qq 80 DEBIAN_FRONTEND=noninteractive apt-get install -y -qq
76 build-essential lintian pkg-config gawk 81 build-essential lintian pkg-config gawk
82 - ./ci/printenv.sh
77 - ./configure 83 - ./configure
78 - make dist 84 - make dist
79 - ./mkdeb.sh --disable-apparmor 85 - ./mkdeb.sh --disable-apparmor
@@ -117,5 +123,6 @@ debian_ci:
117 - export CI_COMMIT_SHA="$(git rev-parse HEAD)" 123 - export CI_COMMIT_SHA="$(git rev-parse HEAD)"
118 script: 124 script:
119 - apt-get --no-install-recommends install -y -qq gawk 125 - apt-get --no-install-recommends install -y -qq gawk
126 - ./ci/printenv.sh
120 - gitlab-ci-git-buildpackage 127 - gitlab-ci-git-buildpackage
121 - gitlab-ci-lintian 128 - gitlab-ci-lintian
diff --git a/Makefile b/Makefile
index 98f368789..749457b1b 100644
--- a/Makefile
+++ b/Makefile
@@ -364,6 +364,10 @@ scan-build: clean
364codespell: clean 364codespell: clean
365 codespell --ignore-regex "UE|creat|shotcut|ether" src test 365 codespell --ignore-regex "UE|creat|shotcut|ether" src test
366 366
367.PHONY: print-env
368print-env:
369 ./ci/printenv.sh
370
367# 371#
368# make test 372# make test
369# 373#
diff --git a/ci/printenv.sh b/ci/printenv.sh
new file mode 100755
index 000000000..4b7e03fa7
--- /dev/null
+++ b/ci/printenv.sh
@@ -0,0 +1,25 @@
1#!/bin/sh
2# Print information that may be useful for debugging CI.
3
4test -f /etc/os-release && . /etc/os-release
5
6cat <<EOF
7nproc: $(nproc)
8kernel: $(uname -srvm)
9distro: $PRETTY_NAME
10sh: $(ls -l /bin/sh | sed 's|.* /bin|/bin|')
11user: $(id | cut -f -2 -d ' ')
12
13[/etc/os-release]
14$(cat /etc/os-release)
15EOF
16
17if test -z "$CI_VERBOSE"; then
18 exit
19fi
20
21cat <<EOF
22
23[env]
24$(env | LC_ALL=C sort)
25EOF