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.

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

fix: bad age.identityPaths default value on darwin, bump to macOS-latest in CI #307

Merged
merged 5 commits into from
Jan 15, 2025
Merged

fix: bad age.identityPaths default value on darwin, bump to macOS-latest in CI #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cce0ff4
fix: bad age.identityPaths default value on darwin
codgician Jan 12, 2025
302ab0c
fix: bump to macOS-15 in CI
codgician Jan 12, 2025
989ade2
feat: dynamically determine architecture in ci
codgician Jan 13, 2025
96b7e4f
contrib: improve readability of age.identityPaths default value
codgician Jan 13, 2025
4d0d81e
fix: bad indentation in ci
codgician Jan 13, 2025
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
11 changes: 8 additions & 3 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
- run: nix fmt . -- --check
- run: nix flake check
tests-darwin:
runs-on: macos-12
runs-on: macos-latest
steps:
- uses: actions/checkout@v3
- uses: cachix/install-nix-action@v24
- uses: cachix/install-nix-action@v30
with:
extra_nix_config: |
system-features = nixos-test recursive-nix benchmark big-parallel kvm
Expand All @@ -31,12 +31,17 @@ jobs:
- run: nix flake check
- name: "Install nix-darwin module"
run: |
# Determine architecture of GitHub runner
ARCH=x86_64
if [ "$(arch)" = arm64 ]; then
ARCH=aarch64
fi
# https://github.com/ryantm/agenix/pull/230#issuecomment-1867025385

sudo mv /etc/nix/nix.conf{,.bak}
nix \
--extra-experimental-features 'nix-command flakes' \
build .#checks.x86_64-darwin.integration
build .#checks."${ARCH}"-darwin.integration

./result/activate-user
sudo ./result/activate
Expand Down
12 changes: 6 additions & 6 deletions modules/age.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,22 +228,22 @@ in {
identityPaths = mkOption {
type = types.listOf types.path;
default =
if (config.services.openssh.enable or false)
then map (e: e.path) (lib.filter (e: e.type == "rsa" || e.type == "ed25519") config.services.openssh.hostKeys)
else if isDarwin
if isDarwin
then [
"/etc/ssh/ssh_host_ed25519_key"
"/etc/ssh/ssh_host_rsa_key"
]
else if (config.services.openssh.enable or false)
then map (e: e.path) (lib.filter (e: e.type == "rsa" || e.type == "ed25519") config.services.openssh.hostKeys)
else [];
defaultText = literalExpression ''
if (config.services.openssh.enable or false)
then map (e: e.path) (lib.filter (e: e.type == "rsa" || e.type == "ed25519") config.services.openssh.hostKeys)
else if isDarwin
if isDarwin
then [
"/etc/ssh/ssh_host_ed25519_key"
"/etc/ssh/ssh_host_rsa_key"
]
else if (config.services.openssh.enable or false)
then map (e: e.path) (lib.filter (e: e.type == "rsa" || e.type == "ed25519") config.services.openssh.hostKeys)
else [];
'';
description = ''
Expand Down
Loading