Skip to content

ci: drop vestigial nix-daemon stop step in nix-eval #2460

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.

Sign up for GitHub

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

Draft
mmlb wants to merge 7 commits into
base: develop
Choose a base branch
from
+1,400 −896
Draft

ci: drop vestigial nix-daemon stop step in nix-eval #2460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d09cad9
ci: drop vestigial nix-daemon stop step in nix-eval
mmlb Sep 17, 2026
9c47e61
ci/nix-install-ephemeral: Add installer option and detsys-nix support
mmlb Sep 17, 2026
ff73481
ci/nix-install-ephemeral: Set stalled-download-timeout=5
mmlb Sep 17, 2026
15e9244
ci: split nix-eval into a per-system matrix using parallel eval
mmlb Sep 17, 2026
9636a9a
ci/nix-build: Split jobs per system
mmlb Sep 17, 2026
7a7c42c
ci/nix-build: Split jobs per pg major version
mmlb Sep 19, 2026
5497ea7
ci/github-matrix: Replace the python package with a jq program
mmlb Sep 17, 2026
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
3 changes: 3 additions & 0 deletions .github/actionlint.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,15 @@ self-hosted-runner:
- aarch64-darwin
- aarch64-linux
- arm-native-runner
- blacksmith-6vcpu-macos-26
- blacksmith-12vcpu-macos-26
- blacksmith-2vcpu-ubuntu-2404
- blacksmith-2vcpu-ubuntu-2404-arm
- blacksmith-4vcpu-ubuntu-2404
- blacksmith-4vcpu-ubuntu-2404-arm
- blacksmith-8vcpu-ubuntu-2404
- blacksmith-16vcpu-ubuntu-2404
- blacksmith-32vcpu-ubuntu-2404
- blacksmith-32vcpu-ubuntu-2404-arm
- large-linux-arm
- large-linux-x86
5 changes: 5 additions & 0 deletions .github/actions/nix-install-ephemeral/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ inputs:
description: AWS region for the Nix binary cache S3 bucket
required: false
default: us-east-1
installer:
description: upstream (default) or determinate
required: false
default: upstream
nix-signing-key:
description: Key used to sign uploads to binary cache, required if push-to-cache is true
required: false
Expand Down Expand Up @@ -49,6 +53,7 @@ runs:
env:
AWS_REGION: ${{ inputs.aws-region }}
GITHUB_TOKEN: ${{ github.token }}
INSTALLER: ${{ inputs.installer }}
NIX_SIGN_SECRET_KEY: ${{ inputs.nix-signing-key }}
PUSH_TO_CACHE: ${{ steps.resolve-push-to-cache.outputs.value }}

Expand Down
13 changes: 11 additions & 2 deletions .github/actions/nix-install-ephemeral/setup-nix.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ cat >"$tmpdir/nix.conf" <<-EOF
extra-substituters = https://nix-postgres-artifacts.s3.amazonaws.com
extra-trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI=
max-jobs = 5
stalled-download-timeout = 5
EOF

if [[ -e /dev/kvm ]]; then
Expand All @@ -46,8 +47,16 @@ fi

maybesudo NIXCONFDIR="$nixconfdir" ./setup-github-access.sh >>"$tmpdir/nix.conf"

curl -L https://releases.nixos.org/nix/nix-2.34.6/install | sh -s -- $daemon --yes --nix-extra-conf-file "$tmpdir/nix.conf"
cat "$nixconfdir/nix.conf"
if [[ ${INSTALLER:-upstream} == determinate ]]; then
echo 'extra-experimental-features = parallel-eval' >>"$tmpdir/nix.conf"
url=https://install.determinate.systems/nix/tag/v3.22.4
args=(install --no-confirm --extra-conf "$tmpdir/nix.conf")
else
url=https://releases.nixos.org/nix/nix-2.34.6/install
args=("$daemon" --yes --nix-extra-conf-file "$tmpdir/nix.conf")
fi
curl --proto '=https' --tlsv1.2 -sSfL "$url" | sh -s -- "${args[@]}"
cat "$nixconfdir"/nix*.conf

# Add nix to PATH for subsequent steps
echo "$path" >>"${GITHUB_PATH:?}"
Loading
Loading