Skip to content

Commit

Permalink
just: match both yaml and yml
Browse files Browse the repository at this point in the history
This fixes a little papercut I ran into when working with the `.custom`
directory, where I wondered why my files weren't included. Turned out we
only match against `.yml` while I used `.yaml`. This makes it so both
endings are valid and included.
  • Loading branch information
msanft committed Jan 20, 2025
1 parent 1d383aa commit 3a219cf
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,12 @@ populate target=default_deploy_target platform=default_platform:
generate cli=default_cli platform=default_platform:
#!/usr/bin/env bash
set -euo pipefail
shopt -s nullglob
nix run -L .#{{ cli }} -- generate \
--workspace-dir ./{{ workspace_dir }} \
--image-replacements ./{{ workspace_dir }}/just.containerlookup \
--reference-values {{ platform }}\
./{{ workspace_dir }}/deployment/*.yml
./{{ workspace_dir }}/deployment/*.{yml,yaml}
# On baremetal SNP, we don't have default values for MinimumTCB, so we need to set some here.
case {{ platform }} in
Expand Down Expand Up @@ -239,6 +240,7 @@ create platform=default_platform:
set cli=default_cli:
#!/usr/bin/env bash
set -euo pipefail
shopt -s nullglob
ns=$(cat ./{{ workspace_dir }}/just.namespace)
nix run -L .#scripts.kubectl-wait-ready -- $ns coordinator
nix run -L .#scripts.kubectl-wait-ready -- $ns port-forwarder-coordinator
Expand All @@ -251,7 +253,7 @@ set cli=default_cli:
--workspace-dir ./{{ workspace_dir }} \
-c localhost:1313 \
--coordinator-policy-hash "${policy}" \
./{{ workspace_dir }}/deployment/*.yml
./{{ workspace_dir }}/deployment/*.{yml,yaml}
# Verify the Coordinator.
verify cli=default_cli:
Expand Down

0 comments on commit 3a219cf

Please sign in to comment.