Skip to content

Commit c375ae5

Browse files
t0b3pcmoore
authored andcommitted
gh: bump ubuntu 24.04
Signed-off-by: Thomas Bettler <[email protected]> Acked-by: Tom Hromatka <[email protected]> [PM: merge fuzz, subject tweak] Signed-off-by: Paul Moore <[email protected]>
1 parent 25f311a commit c375ae5

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on: ["push", "pull_request"]
1111
jobs:
1212
analyze:
1313
name: Analyze
14-
runs-on: ubuntu-latest
14+
runs-on: ubuntu-24.04
1515
permissions:
1616
actions: read
1717
contents: read

.github/workflows/continuous-integration.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ on: ["push", "pull_request"]
2525
jobs:
2626
tests:
2727
name: Tests
28-
runs-on: ubuntu-20.04
28+
runs-on: ubuntu-24.04
2929

3030
steps:
3131
- name: Checkout from github
@@ -43,7 +43,7 @@ jobs:
4343
4444
livetests:
4545
name: Live Tests
46-
runs-on: ubuntu-20.04
46+
runs-on: ubuntu-24.04
4747

4848
steps:
4949
- name: Checkout from github
@@ -62,7 +62,7 @@ jobs:
6262
6363
scanbuild:
6464
name: Scan Build
65-
runs-on: ubuntu-20.04
65+
runs-on: ubuntu-24.04
6666

6767
steps:
6868
- name: Checkout from github
@@ -76,7 +76,7 @@ jobs:
7676
7777
codecoverage:
7878
name: Code Coverage
79-
runs-on: ubuntu-20.04
79+
runs-on: ubuntu-24.04
8080

8181
steps:
8282
- name: Checkout from github
@@ -107,7 +107,7 @@ jobs:
107107
108108
codespell:
109109
name: Codespell
110-
runs-on: ubuntu-20.04
110+
runs-on: ubuntu-24.04
111111

112112
steps:
113113
- name: Checkout from github

Makefile.am

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ CODE_COVERAGE_OUTPUT_FILE = libseccomp.lcov.info
2222
CODE_COVERAGE_OUTPUT_DIRECTORY = libseccomp.lcov.html.d
2323
CODE_COVERAGE_IGNORE_PATTERN = \
2424
*/usr/include/* \
25-
*/src/arch-syscall-check.c \
2625
*/src/syscalls.perf
2726

2827
ACLOCAL_AMFLAGS = -I m4

m4/ax_code_coverage.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ AC_DEFUN([AX_CODE_COVERAGE],[
142142
']
143143
[CODE_COVERAGE_RULES_CAPTURE='
144144
$(code_coverage_v_lcov_cap)$(LCOV) $(code_coverage_quiet) $(addprefix --directory ,$(CODE_COVERAGE_DIRECTORY)) --capture --output-file "$(CODE_COVERAGE_OUTPUT_FILE).tmp" --test-name "$(call code_coverage_sanitize,$(PACKAGE_NAME)-$(PACKAGE_VERSION))" --no-checksum --compat-libtool $(CODE_COVERAGE_LCOV_SHOPTS) $(CODE_COVERAGE_LCOV_OPTIONS)
145-
$(code_coverage_v_lcov_ign)$(LCOV) $(code_coverage_quiet) $(addprefix --directory ,$(CODE_COVERAGE_DIRECTORY)) --remove "$(CODE_COVERAGE_OUTPUT_FILE).tmp" "/tmp/*" $(CODE_COVERAGE_IGNORE_PATTERN) --output-file "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_LCOV_SHOPTS) $(CODE_COVERAGE_LCOV_RMOPTS)
145+
$(code_coverage_v_lcov_ign)$(LCOV) $(code_coverage_quiet) $(addprefix --directory ,$(CODE_COVERAGE_DIRECTORY)) --remove "$(CODE_COVERAGE_OUTPUT_FILE).tmp" $(CODE_COVERAGE_IGNORE_PATTERN) --output-file "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_LCOV_SHOPTS) $(CODE_COVERAGE_LCOV_RMOPTS)
146146
-@rm -f $(CODE_COVERAGE_OUTPUT_FILE).tmp
147147
$(code_coverage_v_genhtml)LANG=C $(GENHTML) $(code_coverage_quiet) $(addprefix --prefix ,$(CODE_COVERAGE_DIRECTORY)) --output-directory "$(CODE_COVERAGE_OUTPUT_DIRECTORY)" --title "$(PACKAGE_NAME)-$(PACKAGE_VERSION) Code Coverage" --legend --show-details "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_GENHTML_OPTIONS)
148148
@echo "file://$(abs_builddir)/$(CODE_COVERAGE_OUTPUT_DIRECTORY)/index.html"

0 commit comments

Comments
 (0)