Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RFE: bump CI to Ubuntu 24.04 #443

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ runs:
- run: sudo apt-get install -y build-essential valgrind clang-tools lcov gperf astyle codespell
shell: bash
- run: |
sudo apt-get install -y python3 python3-distutils python3-setuptools python3-pip
sudo apt-get install -y python3 python3-setuptools python3-pip
python3 -m pip install --upgrade pip
python3 -m pip install cython
# Add cython to the path
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on: ["push", "pull_request"]
jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
t0b3 marked this conversation as resolved.
Show resolved Hide resolved
permissions:
actions: read
contents: read
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ on: ["push", "pull_request"]
jobs:
tests:
name: Tests
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04

steps:
- name: Checkout from github
Expand All @@ -43,7 +43,7 @@ jobs:

livetests:
name: Live Tests
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04

steps:
- name: Checkout from github
Expand All @@ -62,7 +62,7 @@ jobs:

scanbuild:
name: Scan Build
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04

steps:
- name: Checkout from github
Expand All @@ -76,7 +76,7 @@ jobs:

codecoverage:
name: Code Coverage
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04

steps:
- name: Checkout from github
Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:

codespell:
name: Codespell
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04

steps:
- name: Checkout from github
Expand Down
1 change: 0 additions & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ CODE_COVERAGE_OUTPUT_FILE = libseccomp.lcov.info
CODE_COVERAGE_OUTPUT_DIRECTORY = libseccomp.lcov.html.d
CODE_COVERAGE_IGNORE_PATTERN = \
*/usr/include/* \
*/src/arch-syscall-check.c \
*/src/syscalls.perf

ACLOCAL_AMFLAGS = -I m4
Expand Down
2 changes: 1 addition & 1 deletion m4/ax_code_coverage.m4
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ AC_DEFUN([AX_CODE_COVERAGE],[
']
[CODE_COVERAGE_RULES_CAPTURE='
$(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)
$(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)
$(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)
-@rm -f $(CODE_COVERAGE_OUTPUT_FILE).tmp
$(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)
@echo "file://$(abs_builddir)/$(CODE_COVERAGE_OUTPUT_DIRECTORY)/index.html"
Expand Down
Loading