Skip to content

Commit 886ad85

Browse files
committed
Fix CI runner tool assumptions
1 parent 86bcd19 commit 886ad85

3 files changed

Lines changed: 13 additions & 13 deletions

File tree

.github/workflows/build-test.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ jobs:
88
unit-tests:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v4
11+
- uses: actions/checkout@v6
1212
with:
1313
fetch-depth: 0
1414
submodules: recursive
1515

1616
- name: Set up Python
17-
uses: actions/setup-python@v5
17+
uses: actions/setup-python@v6
1818
with:
1919
python-version: '3.11'
2020

@@ -34,18 +34,18 @@ jobs:
3434
test -f src/uBitcoin/src/Bitcoin.h
3535
test "$(git -C src/uBitcoin rev-parse HEAD)" = "877542fdc16319dd92a7d2a679ea9dacce474bd2"
3636
test "$(git ls-files --stage src/uBitcoin | awk '{print $1}')" = "160000"
37-
rg -F '#include "../uBitcoin/src/Bitcoin.h"' src/crypto/UBitcoinBackend.cpp
37+
grep -F '#include "../uBitcoin/src/Bitcoin.h"' src/crypto/UBitcoinBackend.cpp
3838
test ! -e src/crypto/libsecp256k1
3939
test ! -e src/crypto/Secp256k1Backend.cpp
40-
if rg -n 'Hash\.h|Bitcoin\.h' src --glob '!src/uBitcoin/**' --glob '!src/crypto/UBitcoinBackend.cpp'; then
40+
if grep -RInE --exclude-dir=uBitcoin --exclude=UBitcoinBackend.cpp 'Hash\.h|Bitcoin\.h' src; then
4141
echo 'uBitcoin must only be called through UBitcoinBackend' >&2
4242
exit 1
4343
fi
44-
if rg -n '\b(byte|uint8_t|char)[[:space:]]+[A-Za-z_][A-Za-z0-9_]*\[[[:space:]]*(byteSize|messageSize|contentLength|encodedSize|length|NostrString_length)' src examples; then
44+
if grep -RInE '(^|[^[:alnum:]_])(byte|uint8_t|char)[[:space:]]+[A-Za-z_][A-Za-z0-9_]*\[[[:space:]]*(byteSize|messageSize|contentLength|encodedSize|length|NostrString_length)' src examples; then
4545
echo 'VLA-like declaration found' >&2
4646
exit 1
4747
fi
48-
test "$(rg -c --no-filename '^\[env:ESP32' platformio.ini | awk '{s+=$1} END {print s+0}')" -eq 4
48+
test "$(grep -Ec '^\[env:ESP32' platformio.ini)" -eq 4
4949
5050
- name: Check release metadata
5151
run: |

.github/workflows/docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212

1313
steps:
1414
- name: Check out code
15-
uses: actions/checkout@v4
15+
uses: actions/checkout@v6
1616

1717
- name: Set up Node.js
18-
uses: actions/setup-node@v4
18+
uses: actions/setup-node@v6
1919
with:
2020
node-version: '20'
2121

.github/workflows/publish-package.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ jobs:
88
publish:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v4
11+
- uses: actions/checkout@v6
1212
with:
1313
submodules: recursive
1414

1515
- name: Set up Python
16-
uses: actions/setup-python@v5
16+
uses: actions/setup-python@v6
1717
with:
1818
python-version: '3.11'
1919

@@ -36,9 +36,9 @@ jobs:
3636
archive=$(find . -maxdepth 1 -type f -name 'Nostrduino-*.tar.gz' -print -quit)
3737
test -n "$archive"
3838
tar -tzf "$archive" > package-contents.txt
39-
rg 'src/crypto/UBitcoinBackend\.cpp$' package-contents.txt
40-
rg 'src/uBitcoin/src/Bitcoin\.cpp$' package-contents.txt
41-
if rg 'src/(esp8266|picow|unor4|crypto/libsecp256k1)/|src/uBitcoin/(examples|tests)/' package-contents.txt; then
39+
grep -E 'src/crypto/UBitcoinBackend\.cpp$' package-contents.txt
40+
grep -E 'src/uBitcoin/src/Bitcoin\.cpp$' package-contents.txt
41+
if grep -E 'src/(esp8266|picow|unor4|crypto/libsecp256k1)/|src/uBitcoin/(examples|tests)/' package-contents.txt; then
4242
echo 'unexpected platform, backend, or submodule test source in package' >&2
4343
exit 1
4444
fi

0 commit comments

Comments
 (0)