From 5e6e3d16640179aca719fe5843cf62a9408271ca Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Mon, 12 May 2025 09:00:00 -0700 Subject: [PATCH 1/2] .github: try to avoid OOM with max-jobs = 1 --- .github/workflows/main.yml | 3 +++ .github/workflows/update.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 35551c89..61a3c0fe 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,6 +26,9 @@ jobs: - uses: actions/checkout@v4 - uses: cachix/install-nix-action@v31 + with: + extra_nix_config: | + max-jobs = 1 - name: build run: nix-build -A ci diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 6f740f65..488215be 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -14,6 +14,9 @@ jobs: path: repo - uses: cachix/install-nix-action@v31 + with: + extra_nix_config: | + max-jobs = 1 - name: Run update script run: | From cfbe64b362ab894662927f008711b8859760fd3a Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Mon, 12 May 2025 09:00:20 -0700 Subject: [PATCH 2/2] default.nix: turn back on the other nixpkgsCheck jobs --- default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/default.nix b/default.nix index 73667c4b..0f9cee5f 100644 --- a/default.nix +++ b/default.nix @@ -162,11 +162,11 @@ let # Tests the tool on the pinned Nixpkgs tree with various Nix and Lix versions. # This allows exposure to changes in behavior from Nix and Nix-alikes. - #nixpkgsCheckWithLatestNix = packages.nixpkgsCheck.nixVersions.latest; - #nixpkgsCheckWithGitNix = packages.nixpkgsCheck.nixVersions.git; - #nixpkgsCheckWithMinimumNix = packages.nixpkgsCheck.nixVersions.minimum; - #nixpkgsCheckWithStableLix = packages.nixpkgsCheck.lixVersions.stable; - #nixpkgsCheckWithLatestLix = packages.nixpkgsCheck.lixVersions.latest; + nixpkgsCheckWithLatestNix = packages.nixpkgsCheck.nixVersions.latest; + nixpkgsCheckWithGitNix = packages.nixpkgsCheck.nixVersions.git; + nixpkgsCheckWithMinimumNix = packages.nixpkgsCheck.nixVersions.minimum; + nixpkgsCheckWithStableLix = packages.nixpkgsCheck.lixVersions.stable; + nixpkgsCheckWithLatestLix = packages.nixpkgsCheck.lixVersions.latest; }; in packages