diff options
| author | Jon Atack <jon@atack.com> | 2024-05-01 14:22:37 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-01 14:22:37 -0700 |
| commit | 253dd0999e505e1f09dacab4874b2f2e4118e6a4 (patch) | |
| tree | f1120df673ef597d1e8d5d26342e59715a1cccb8 | |
| parent | 602cd676cd4ec95d1143aa6f2c39d661e95a2897 (diff) | |
| parent | 09439bb6626305c0bf146069cf8ea467d05b87c5 (diff) | |
Merge pull request #1578 from achow101/fix-ci
ci: Update diff checks so that the task actually works
| -rw-r--r-- | .github/workflows/github-action-checks.yml | 9 | ||||
| -rwxr-xr-x | scripts/diffcheck.sh | 3 |
2 files changed, 9 insertions, 3 deletions
diff --git a/.github/workflows/github-action-checks.yml b/.github/workflows/github-action-checks.yml index bfc014b..8a7d2ac 100644 --- a/.github/workflows/github-action-checks.yml +++ b/.github/workflows/github-action-checks.yml @@ -5,15 +5,18 @@ jobs: Link-Format-Checks: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - run: scripts/link-format-chk.sh Build-Table-Checks: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - run: scripts/buildtable.pl >/tmp/table.mediawiki || exit 1 Diff-Checks: + name: "Diff Checks (fails until number assignment)" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 + with: + fetch-depth: 2 - run: scripts/diffcheck.sh diff --git a/scripts/diffcheck.sh b/scripts/diffcheck.sh index 4e4c459..aa9f557 100755 --- a/scripts/diffcheck.sh +++ b/scripts/diffcheck.sh @@ -1,5 +1,6 @@ #!/bin/bash +scripts/buildtable.pl >/tmp/table.mediawiki 2> /dev/null diff README.mediawiki /tmp/table.mediawiki | grep '^[<>] |' >/tmp/after.diff || true if git checkout HEAD^ && scripts/buildtable.pl >/tmp/table.mediawiki 2>/dev/null; then diff README.mediawiki /tmp/table.mediawiki | grep '^[<>] |' >/tmp/before.diff || true @@ -8,6 +9,8 @@ if git checkout HEAD^ && scripts/buildtable.pl >/tmp/table.mediawiki 2>/dev/null echo "$newdiff" exit 1 fi + echo "README table matches expected table from BIP files" else echo 'Cannot build previous commit table for comparison' + exit 1 fi |