From 6bbc7ede24004687c1112fa7a4268f4a9d57071f Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Tue, 28 Apr 2026 22:54:45 +1200 Subject: [PATCH 1/2] fix: Workflows hanging on --quiet flag --- .github/workflows/check.yml | 42 +++++++++++++++++++++++++++++++++++++ .github/workflows/push.yml | 34 ++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 071a327c..27eafd31 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -87,3 +87,45 @@ jobs: fi done echo "Directory structure is valid." + validate-geometry-changed: + # Enforces RFC 7946 + project geometry rules on files modified in this PR + # only. Legacy violations on main are intentionally not blocked here; see + # CONTRIBUTING.md and push.yml. + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Install node + uses: actions/setup-node@v4 + with: + node-version: 24.x + - name: Install deps + shell: sh + working-directory: ./scripts + run: yarn + - name: List changed boundary files + id: changed + shell: bash + env: + BASE_REF: ${{ github.event.pull_request.base.ref }} + run: | + git fetch --no-tags --depth=1 origin "$BASE_REF" + CHANGED=$(git diff --name-only --diff-filter=AM "origin/$BASE_REF"...HEAD -- 'Boundaries/**/*.json' || true) + echo "files<> "$GITHUB_OUTPUT" + echo "$CHANGED" >> "$GITHUB_OUTPUT" + echo "EOF" >> "$GITHUB_OUTPUT" + if [ -z "$CHANGED" ]; then + echo "No boundary files changed in this PR." + else + echo "Changed boundary files:" + echo "$CHANGED" + fi + - name: Validate geometry on changed files + if: steps.changed.outputs.files != '' + shell: bash + working-directory: ./scripts + env: + CHANGED_FILES: ${{ steps.changed.outputs.files }} + run: | + printf '%s\n' "$CHANGED_FILES" | yarn validate-geometry --changed-only diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 4ddc771a..c33cb30d 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -43,3 +43,37 @@ jobs: name: TRACONBoundaries.geojson path: | TRACONBoundaries.geojson + if-no-files-found: error + retention-days: 30 + validate-geometry-full: + # Non-blocking full-dataset geometry sweep on main. Surfaces legacy + # violations as a downloadable report without failing the workflow — the + # PR-side check (validate-geometry-changed in check.yml) is the gate. + runs-on: ubuntu-latest + continue-on-error: true + steps: + - uses: actions/checkout@v4 + - name: Install node + uses: actions/setup-node@v4 + with: + node-version: 24.x + - name: Install deps + shell: sh + working-directory: ./scripts + run: yarn + - name: Run full geometry validation + shell: bash + working-directory: ./scripts + run: | + set +e + yarn validate-geometry > ../geometry-report.txt 2>&1 + status=$? + echo "validate-geometry exit code: $status" >> ../geometry-report.txt + exit 0 + - name: Upload geometry report + uses: actions/upload-artifact@v4 + with: + name: geometry-report + path: geometry-report.txt + if-no-files-found: error + retention-days: 30 From 83d381a436f987dc4972287f4077ff6c6156a463 Mon Sep 17 00:00:00 2001 From: Tom <13634684+dirtyformal@users.noreply.github.com> Date: Tue, 28 Apr 2026 22:59:30 +1200 Subject: [PATCH 2/2] fix: update links in pull request template for contributor checklist --- .github/pull_request_template.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index dc99c441..077e9142 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -30,9 +30,9 @@ -- [ ] I have read [CONTRIBUTING.md](../blob/main/CONTRIBUTING.md) and I am on the approved-contributor list (or an approved contributor has commented their approval on this PR) +- [ ] I have read [CONTRIBUTING.md](../../blob/main/CONTRIBUTING.md) and I am on the approved-contributor list (or an approved contributor has commented their approval on this PR) +- [ ] My geometry meets the standards in [CONTRIBUTING.md](../../blob/main/CONTRIBUTING.md) - [ ] I ran `yarn validate` locally and it passes -- [ ] My geometry meets the standards in CONTRIBUTING.md - [ ] If I touched a legacy file, I ran `yarn validate-geometry --fix` and brought it up to current standards