Skip to content

Commit 253dd09

Browse files
authored
Merge pull request bitcoin#1578 from achow101/fix-ci
ci: Update diff checks so that the task actually works
2 parents 602cd67 + 09439bb commit 253dd09

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

.github/workflows/github-action-checks.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,18 @@ jobs:
55
Link-Format-Checks:
66
runs-on: ubuntu-latest
77
steps:
8-
- uses: actions/checkout@v3
8+
- uses: actions/checkout@v4
99
- run: scripts/link-format-chk.sh
1010
Build-Table-Checks:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414
- run: scripts/buildtable.pl >/tmp/table.mediawiki || exit 1
1515
Diff-Checks:
16+
name: "Diff Checks (fails until number assignment)"
1617
runs-on: ubuntu-latest
1718
steps:
18-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
20+
with:
21+
fetch-depth: 2
1922
- run: scripts/diffcheck.sh

scripts/diffcheck.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/bin/bash
22

3+
scripts/buildtable.pl >/tmp/table.mediawiki 2> /dev/null
34
diff README.mediawiki /tmp/table.mediawiki | grep '^[<>] |' >/tmp/after.diff || true
45
if git checkout HEAD^ && scripts/buildtable.pl >/tmp/table.mediawiki 2>/dev/null; then
56
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
89
echo "$newdiff"
910
exit 1
1011
fi
12+
echo "README table matches expected table from BIP files"
1113
else
1214
echo 'Cannot build previous commit table for comparison'
15+
exit 1
1316
fi

0 commit comments

Comments
 (0)