Skip to content

Commit d4b7c10

Browse files
committed
PHP 7.4 and 8.0 pipelines seem affected by this obscure Valgrind bug.
php/php-src#10221
1 parent 6315ebc commit d4b7c10

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,21 @@ jobs:
1414
- uses: actions/checkout@v3
1515
with:
1616
submodules: recursive
17-
- uses: shivammathur/setup-php@verbose
17+
- uses: shivammathur/setup-php@v2
1818
env:
1919
debug: true
20-
update: true
2120
with:
2221
php-version: ${{ matrix.php-version }}
2322
ini-values: opcache.enable=1, opcache.enable_cli=1, opcache.protect_memory=1
2423
- name: Build secp256k1 and PHP extension
2524
run: |
2625
make secp256k1 ext
27-
- name: Test PHP extension
26+
- name: Test PHP extension without Valgrind
27+
if: ${{ matrix.php-version == '7.4' || matrix.php-version == '8.0' }}
2828
run: |
29-
sudo apt-get install valgrind
3029
make check
30+
- name: Test PHP extension with Valgrind
31+
if: ${{ matrix.php-version == '8.1' || matrix.php-version == '8.2' }}
32+
run: |
33+
sudo apt-get install valgrind
34+
make check-valgrind

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.PHONY: ext secp256k1 check install clean
1+
.PHONY: ext secp256k1 check check-valgrind install clean
22

33
ext:
44
cd ext && \
@@ -22,6 +22,9 @@ secp256k1:
2222
make -C secp256k1 install
2323

2424
check:
25+
make -C ext test TESTS="-q --show-diff --show-mem"
26+
27+
check-valgrind:
2528
make -C ext test TESTS="-q -m --show-diff --show-mem"
2629

2730
install:

README.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,6 @@ for a valid private key, but in practice this should never happen.
137137
$ make check
138138
```
139139

140-
You will need Valgrind on your system to run this command. On Ubuntu that'd be:
141-
142-
```shell
143-
$ sudo apt install valgrind
144-
```
145-
146140
### Does `secp256k1_nostr` follow [semantic versioning](https://semver.org/)?
147141

148142
Yes, but the API may still evolve before the 1.0 release.

0 commit comments

Comments
 (0)