Skip to content
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
5 changes: 5 additions & 0 deletions .github/actions/install-nix/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ inputs:
role-to-assume:
description: AWS Role to assume when configuring aws credentials, required if push-to-cache is true
required: false
single-user:
description: Install Nix in single-user mode, without the Nix daemon, even when systemd is running. Eval-heavy jobs run faster this way.
required: false
default: false
runs:
using: composite
steps:
Expand Down Expand Up @@ -56,6 +60,7 @@ runs:
GITHUB_TOKEN: ${{ github.token }}
NIX_SIGN_SECRET_KEY: ${{ inputs.nix-signing-key }}
PUSH_TO_CACHE: ${{ steps.resolve-push-to-cache.outputs.value }}
SINGLE_USER: ${{ inputs.single-user }}

- name: verify nix in path
shell: bash
Expand Down
5 changes: 3 additions & 2 deletions .github/actions/install-nix/setup-nix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
readonly version=2.35.3
set -euo pipefail

if systemctl whoami &>/dev/null || [[ $(uname) == Darwin ]]; then
if [[ ${SINGLE_USER:-false} != true ]] && { systemctl whoami &>/dev/null || [[ $(uname) == Darwin ]]; }; then
# systemd is running so we can install in multi-user mode
# or running on macos
daemon=--daemon
Expand All @@ -15,7 +15,8 @@ if systemctl whoami &>/dev/null || [[ $(uname) == Darwin ]]; then

function maybesudo { sudo -H --preserve-env=GITHUB_TOKEN,AWS_REGION,AWS_ACCESS_KEY_ID,AWS_SECRET_ACCESS_KEY,AWS_SESSION_TOKEN,NIX_SIGN_SECRET_KEY env "$@"; }
else
# systemd is *not* running so we must install in single-user mode
# Install in single-user mode: either systemd is *not* running, or the caller asked for it.
# Useful for eval-heavy jobs which run faster without the daemon.
daemon=--no-daemon
nixconfdir=$HOME/.config/nix
path=$HOME/.nix-profile/bin
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/actions.lock
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,13 @@ workflows:
'.github/workflows/nix-build.yml':
- 'actions/checkout@v7.0.1'
- 'actions/download-artifact@v8.0.2'
- 'actions/upload-artifact@v7.0.2'
- 'aws-actions/configure-aws-credentials@v6.3.0'
- 'peter-evans/create-or-update-comment@v5.0.0'
- 'peter-evans/find-comment@v4.0.0'
'.github/workflows/nix-ci-per-system.yml':
- 'actions/checkout@v7.0.1'
- 'actions/download-artifact@v8.0.2'
- 'actions/upload-artifact@v7.0.2'
- 'aws-actions/configure-aws-credentials@v6.3.0'
'.github/workflows/nix-dependency-analysis.yml':
- 'actions/checkout@v7.0.1'
- 'aws-actions/configure-aws-credentials@v6.3.0'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker-image-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ permissions:

jobs:
check-changes:
name: skippable
name: 🐳Changes
runs-on: blacksmith-2vcpu-ubuntu-2404
outputs:
should_run: ${{ steps.check.outputs.should_run }}
Expand All @@ -41,7 +41,7 @@ jobs:
base_ref: ${{ github.base_ref }}

docker-image-test:
name: Test ${{ matrix.name }}
name: 🐳${{ matrix.name }}
needs: check-changes
if: needs.check-changes.outputs.should_run == 'true'
runs-on: large-linux-arm
Expand Down
Loading
Loading