Skip to content

Commit 47f5e5f

Browse files
authored
Merge pull request #13567 from xokdvium/split-sanitizers-ci
ci: Run sanitizer tests in a separate job
2 parents 9c9473a + 413f782 commit 47f5e5f

File tree

4 files changed

+24
-21
lines changed

4 files changed

+24
-21
lines changed

.github/workflows/ci.yml

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,18 @@ jobs:
2929
- scenario: on ubuntu
3030
runs-on: ubuntu-24.04
3131
os: linux
32+
sanitizers: false
33+
primary: true
3234
- scenario: on macos
3335
runs-on: macos-14
3436
os: darwin
37+
sanitizers: false
38+
primary: true
39+
- scenario: on ubuntu (with sanitizers)
40+
runs-on: ubuntu-24.04
41+
os: linux
42+
sanitizers: true
43+
primary: false
3544
name: tests ${{ matrix.scenario }}
3645
runs-on: ${{ matrix.runs-on }}
3746
timeout-minutes: 60
@@ -52,13 +61,21 @@ jobs:
5261
# https://ubuntu.com/blog/ubuntu-23-10-restricted-unprivileged-user-namespaces
5362
- run: sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
5463
if: matrix.os == 'linux'
55-
- run: scripts/build-checks
56-
- run: scripts/prepare-installer-for-github-actions
64+
- name: Run component tests
65+
run: |
66+
nix build --file ci/gha/tests componentTests -L \
67+
--arg withSanitizers ${{ matrix.sanitizers }}
68+
- name: Run flake checks and prepare the installer tarball
69+
run: |
70+
ci/gha/tests/build-checks
71+
ci/gha/tests/prepare-installer-for-github-actions
72+
if: ${{ matrix.primary }}
5773
- name: Upload installer tarball
5874
uses: actions/upload-artifact@v4
5975
with:
6076
name: installer-${{matrix.os}}
6177
path: out/*
78+
if: ${{ matrix.primary }}
6279

6380
installer_test:
6481
needs: [tests]
File renamed without changes.

flake.nix

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -337,25 +337,11 @@
337337
# Add "passthru" tests
338338
//
339339
flatMapAttrs
340-
(
341-
{
342-
"" = {
343-
pkgs = nixpkgsFor.${system}.native;
344-
};
345-
}
346-
// lib.optionalAttrs (!nixpkgsFor.${system}.native.stdenv.hostPlatform.isDarwin) {
347-
# TODO: enable static builds for darwin, blocked on:
348-
# https://github.com/NixOS/nixpkgs/issues/320448
349-
# TODO: disabled to speed up GHA CI.
350-
# "static-" = {
351-
# pkgs = nixpkgsFor.${system}.native.pkgsStatic;
352-
# };
353-
"sanitized-" = {
354-
pkgs = nixpkgsFor.${system}.native;
355-
withSanitizers = true;
356-
};
357-
}
358-
)
340+
{
341+
"" = {
342+
pkgs = nixpkgsFor.${system}.native;
343+
};
344+
}
359345
(
360346
nixpkgsPrefix: args:
361347
(import ./ci/gha/tests (

0 commit comments

Comments
 (0)