jose.martinez/eqt-network-meraki
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: problem with the sites discovery

Browse Source
This commit is contained in:
Xavier Lario
2026-04-20 16:14:17 +02:00
parent a797a18909
commit 20c9b142fd
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/apply.yml
+2 -2
View File
@@ -21,12 +21,12 @@ jobs:
- id: detect - id: detect
run: | run: |
all_sites=$(find sites -maxdepth 1 -mindepth 1 -type d -exec basename {} \; | sort | jq -sRc '.') all_sites=$(find sites -maxdepth 1 -mindepth 1 -type d -exec basename {} \; | sort | jq -Rc 'select(. != "")' | jq -sc '.')
if git diff HEAD~1...HEAD --name-only | grep -qE '^(modules/|backend\.hcl)'; then if git diff HEAD~1...HEAD --name-only | grep -qE '^(modules/|backend\.hcl)'; then
echo "has-changes=true" >> $GITHUB_OUTPUT echo "has-changes=true" >> $GITHUB_OUTPUT
echo "matrix={\"site\": $all_sites}" >> $GITHUB_OUTPUT echo "matrix={\"site\": $all_sites}" >> $GITHUB_OUTPUT
else else
changed=$(git diff HEAD~1...HEAD --name-only | grep '^sites/' | cut -d/ -f2 | sort -u | jq -sRc '.') changed=$(git diff HEAD~1...HEAD --name-only | grep '^sites/' | cut -d/ -f2 | sort -u | jq -Rc 'select(. != "")' | jq -sc '.')
if [ "$changed" = "[]" ] || [ -z "$changed" ]; then if [ "$changed" = "[]" ] || [ -z "$changed" ]; then
echo "has-changes=false" >> $GITHUB_OUTPUT echo "has-changes=false" >> $GITHUB_OUTPUT
echo "matrix={\"site\": []}" >> $GITHUB_OUTPUT echo "matrix={\"site\": []}" >> $GITHUB_OUTPUT
.github/workflows/plan.yml
+2 -2
View File
@@ -22,12 +22,12 @@ jobs:
- id: detect - id: detect
run: | run: |
all_sites=$(find sites -maxdepth 1 -mindepth 1 -type d -exec basename {} \; | sort | jq -sRc '.') all_sites=$(find sites -maxdepth 1 -mindepth 1 -type d -exec basename {} \; | sort | jq -Rc 'select(. != "")' | jq -sc '.')
if git diff origin/main...HEAD --name-only | grep -qE '^(modules/|backend\.hcl)'; then if git diff origin/main...HEAD --name-only | grep -qE '^(modules/|backend\.hcl)'; then
echo "has-changes=true" >> $GITHUB_OUTPUT echo "has-changes=true" >> $GITHUB_OUTPUT
echo "matrix={\"site\": $all_sites}" >> $GITHUB_OUTPUT echo "matrix={\"site\": $all_sites}" >> $GITHUB_OUTPUT
else else
changed=$(git diff origin/main...HEAD --name-only | grep '^sites/' | cut -d/ -f2 | sort -u | jq -sRc '.') changed=$(git diff origin/main...HEAD --name-only | grep '^sites/' | cut -d/ -f2 | sort -u | jq -Rc 'select(. != "")' | jq -sc '.')
if [ "$changed" = "[]" ] || [ -z "$changed" ]; then if [ "$changed" = "[]" ] || [ -z "$changed" ]; then
echo "has-changes=false" >> $GITHUB_OUTPUT echo "has-changes=false" >> $GITHUB_OUTPUT
echo "matrix={\"site\": []}" >> $GITHUB_OUTPUT echo "matrix={\"site\": []}" >> $GITHUB_OUTPUT