aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2024-02-03 20:24:45 +0000
committerLibravatar GitHub <noreply@github.com>2024-02-03 20:24:45 +0000
commit180bdee34774ed56c3a1822eb69d51e4cd9e5eaf (patch)
tree24808a5f0085478b69ba63a25b2b1008092e8eab
parentgeeqie.profile: allow Lua interpreter (#6183) (diff)
downloadfirejail-180bdee34774ed56c3a1822eb69d51e4cd9e5eaf.tar.gz
firejail-180bdee34774ed56c3a1822eb69d51e4cd9e5eaf.tar.zst
firejail-180bdee34774ed56c3a1822eb69d51e4cd9e5eaf.zip
ci: add timeout limits (#6178)
So that they fail early instead of letting them run indefinitely when there are problems with the CI infrastructure. Use 5 minutes for the jobs that usually complete in under a minute (check-profiles and codespell) and 10 minutes for the rest (most jobs usually take 1-3 minutes).
-rw-r--r--.github/workflows/build-extra.yml1
-rw-r--r--.github/workflows/build.yml1
-rw-r--r--.github/workflows/check-c.yml4
-rw-r--r--.github/workflows/check-profiles.yml2
-rw-r--r--.github/workflows/check-python.yml1
-rw-r--r--.github/workflows/codespell.yml1
-rw-r--r--.github/workflows/test.yml5
-rw-r--r--.gitlab-ci.yml7
8 files changed, 22 insertions, 0 deletions
diff --git a/.github/workflows/build-extra.yml b/.github/workflows/build-extra.yml
index 6c2905e43..3e0cec9c5 100644
--- a/.github/workflows/build-extra.yml
+++ b/.github/workflows/build-extra.yml
@@ -41,6 +41,7 @@ permissions: # added using https://github.com/step-security/secure-workflows
41jobs: 41jobs:
42 build-clang: 42 build-clang:
43 runs-on: ubuntu-22.04 43 runs-on: ubuntu-22.04
44 timeout-minutes: 10
44 steps: 45 steps:
45 - name: Harden Runner 46 - name: Harden Runner
46 uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 47 uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ae1aef039..b63eee824 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -57,6 +57,7 @@ permissions: # added using https://github.com/step-security/secure-workflows
57jobs: 57jobs:
58 build: 58 build:
59 runs-on: ubuntu-22.04 59 runs-on: ubuntu-22.04
60 timeout-minutes: 10
60 steps: 61 steps:
61 - name: Harden Runner 62 - name: Harden Runner
62 uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 63 uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895
diff --git a/.github/workflows/check-c.yml b/.github/workflows/check-c.yml
index 16e034d48..ef952d132 100644
--- a/.github/workflows/check-c.yml
+++ b/.github/workflows/check-c.yml
@@ -43,6 +43,7 @@ permissions: # added using https://github.com/step-security/secure-workflows
43jobs: 43jobs:
44 scan-build: 44 scan-build:
45 runs-on: ubuntu-22.04 45 runs-on: ubuntu-22.04
46 timeout-minutes: 10
46 steps: 47 steps:
47 - name: Harden Runner 48 - name: Harden Runner
48 uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 49 uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895
@@ -74,6 +75,7 @@ jobs:
74 75
75 cppcheck: 76 cppcheck:
76 runs-on: ubuntu-22.04 77 runs-on: ubuntu-22.04
78 timeout-minutes: 10
77 steps: 79 steps:
78 - name: Harden Runner 80 - name: Harden Runner
79 uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 81 uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895
@@ -101,6 +103,7 @@ jobs:
101 # scan all files also with older cppcheck version from ubuntu 20.04. 103 # scan all files also with older cppcheck version from ubuntu 20.04.
102 cppcheck_old: 104 cppcheck_old:
103 runs-on: ubuntu-20.04 105 runs-on: ubuntu-20.04
106 timeout-minutes: 10
104 steps: 107 steps:
105 - name: Harden Runner 108 - name: Harden Runner
106 uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 109 uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895
@@ -129,6 +132,7 @@ jobs:
129 contents: read 132 contents: read
130 security-events: write 133 security-events: write
131 runs-on: ubuntu-latest 134 runs-on: ubuntu-latest
135 timeout-minutes: 10
132 136
133 steps: 137 steps:
134 - name: Harden Runner 138 - name: Harden Runner
diff --git a/.github/workflows/check-profiles.yml b/.github/workflows/check-profiles.yml
index 0185376a4..2ae600301 100644
--- a/.github/workflows/check-profiles.yml
+++ b/.github/workflows/check-profiles.yml
@@ -29,6 +29,8 @@ permissions: # added using https://github.com/step-security/secure-workflows
29jobs: 29jobs:
30 profile-checks: 30 profile-checks:
31 runs-on: ubuntu-latest 31 runs-on: ubuntu-latest
32 timeout-minutes: 5
33
32 steps: 34 steps:
33 - name: Harden Runner 35 - name: Harden Runner
34 uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 36 uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895
diff --git a/.github/workflows/check-python.yml b/.github/workflows/check-python.yml
index 76eaa584e..bd3371c9e 100644
--- a/.github/workflows/check-python.yml
+++ b/.github/workflows/check-python.yml
@@ -27,6 +27,7 @@ jobs:
27 contents: read 27 contents: read
28 security-events: write 28 security-events: write
29 runs-on: ubuntu-latest 29 runs-on: ubuntu-latest
30 timeout-minutes: 10
30 31
31 steps: 32 steps:
32 - name: Harden Runner 33 - name: Harden Runner
diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml
index f3c512c3e..c6350838a 100644
--- a/.github/workflows/codespell.yml
+++ b/.github/workflows/codespell.yml
@@ -21,6 +21,7 @@ permissions: # added using https://github.com/step-security/secure-workflows
21jobs: 21jobs:
22 codespell: 22 codespell:
23 runs-on: ubuntu-22.04 23 runs-on: ubuntu-22.04
24 timeout-minutes: 5
24 steps: 25 steps:
25 - name: Harden Runner 26 - name: Harden Runner
26 uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 27 uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0a6069a5c..f7ba1ae4f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -49,6 +49,7 @@ permissions: # added using https://github.com/step-security/secure-workflows
49jobs: 49jobs:
50 test-main: 50 test-main:
51 runs-on: ubuntu-22.04 51 runs-on: ubuntu-22.04
52 timeout-minutes: 10
52 env: 53 env:
53 SHELL: /bin/bash 54 SHELL: /bin/bash
54 steps: 55 steps:
@@ -96,6 +97,7 @@ jobs:
96 97
97 test-fs: 98 test-fs:
98 runs-on: ubuntu-22.04 99 runs-on: ubuntu-22.04
100 timeout-minutes: 10
99 env: 101 env:
100 SHELL: /bin/bash 102 SHELL: /bin/bash
101 steps: 103 steps:
@@ -134,6 +136,7 @@ jobs:
134 136
135 test-environment: 137 test-environment:
136 runs-on: ubuntu-22.04 138 runs-on: ubuntu-22.04
139 timeout-minutes: 10
137 env: 140 env:
138 SHELL: /bin/bash 141 SHELL: /bin/bash
139 steps: 142 steps:
@@ -172,6 +175,7 @@ jobs:
172 175
173 test-utils: 176 test-utils:
174 runs-on: ubuntu-22.04 177 runs-on: ubuntu-22.04
178 timeout-minutes: 10
175 env: 179 env:
176 SHELL: /bin/bash 180 SHELL: /bin/bash
177 steps: 181 steps:
@@ -212,6 +216,7 @@ jobs:
212 216
213 test-network: 217 test-network:
214 runs-on: ubuntu-22.04 218 runs-on: ubuntu-22.04
219 timeout-minutes: 10
215 env: 220 env:
216 SHELL: /bin/bash 221 SHELL: /bin/bash
217 steps: 222 steps:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cb88c0263..08b006f74 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,6 +8,7 @@
8 8
9build_ubuntu_package: 9build_ubuntu_package:
10 image: ubuntu:rolling 10 image: ubuntu:rolling
11 timeout: 10 minutes
11 variables: 12 variables:
12 DEBIAN_FRONTEND: noninteractive 13 DEBIAN_FRONTEND: noninteractive
13 script: 14 script:
@@ -24,6 +25,7 @@ build_ubuntu_package:
24 25
25build_debian_package: 26build_debian_package:
26 image: debian:buster 27 image: debian:buster
28 timeout: 10 minutes
27 variables: 29 variables:
28 DEBIAN_FRONTEND: noninteractive 30 DEBIAN_FRONTEND: noninteractive
29 script: 31 script:
@@ -40,6 +42,7 @@ build_debian_package:
40 42
41build_redhat_package: 43build_redhat_package:
42 image: almalinux:latest 44 image: almalinux:latest
45 timeout: 10 minutes
43 script: 46 script:
44 - dnf update -y 47 - dnf update -y
45 - dnf install -y rpm-build gcc make 48 - dnf install -y rpm-build gcc make
@@ -51,6 +54,7 @@ build_redhat_package:
51 54
52build_fedora_package: 55build_fedora_package:
53 image: fedora:latest 56 image: fedora:latest
57 timeout: 10 minutes
54 script: 58 script:
55 - dnf update -y 59 - dnf update -y
56 - dnf install -y rpm-build gcc make 60 - dnf install -y rpm-build gcc make
@@ -62,6 +66,7 @@ build_fedora_package:
62 66
63build_src_package: 67build_src_package:
64 image: alpine:latest 68 image: alpine:latest
69 timeout: 10 minutes
65 script: 70 script:
66 - apk update 71 - apk update
67 - apk upgrade 72 - apk upgrade
@@ -74,6 +79,7 @@ build_src_package:
74 79
75build_no_apparmor: 80build_no_apparmor:
76 image: ubuntu:latest 81 image: ubuntu:latest
82 timeout: 10 minutes
77 variables: 83 variables:
78 DEBIAN_FRONTEND: noninteractive 84 DEBIAN_FRONTEND: noninteractive
79 script: 85 script:
@@ -92,6 +98,7 @@ build_no_apparmor:
92 98
93debian_ci: 99debian_ci:
94 image: registry.salsa.debian.org/salsa-ci-team/ci-image-git-buildpackage:latest 100 image: registry.salsa.debian.org/salsa-ci-team/ci-image-git-buildpackage:latest
101 timeout: 10 minutes
95 variables: 102 variables:
96 DEBFULLNAME: "$GITLAB_USER_NAME" 103 DEBFULLNAME: "$GITLAB_USER_NAME"
97 DEBEMAIL: "$GITLAB_USER_EMAIL" 104 DEBEMAIL: "$GITLAB_USER_EMAIL"