Skip to content

Commit 47ddf50

Browse files
committed
Enable SHSTK in CI
1 parent 5c724e2 commit 47ddf50

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

.github/workflows/nightly.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
fail-fast: false
6060
matrix:
6161
branch: ${{ fromJson(needs.GENERATE_MATRIX.outputs.branches) }}
62-
configuration_parameters: ['']
62+
configuration_parameters: ['CFLAGS="-fcf-protection=full" LDFLAGS="-Wl,-z,cet-report=error"']
6363
debug: [true, false]
6464
name: ['']
6565
run_tests_parameters: ['']
@@ -112,12 +112,16 @@ jobs:
112112
uses: ./.github/actions/setup-x64
113113
- name: Test
114114
uses: ./.github/actions/test-linux
115+
env:
116+
GLIBC_TUNABLES: 'glibc.cpu.hwcaps=SHSTK'
115117
with:
116118
runTestsParameters: >-
117119
${{ matrix.run_tests_parameters }}
118120
idleCpu: ${{ matrix.asan && 'true' || 'false' }}
119121
- name: Test Tracing JIT
120122
uses: ./.github/actions/test-linux
123+
env:
124+
GLIBC_TUNABLES: 'glibc.cpu.hwcaps=SHSTK'
121125
with:
122126
jitType: tracing
123127
runTestsParameters: >-

.github/workflows/push.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110
configurationParameters: >-
111111
--${{ matrix.debug && 'enable' || 'disable' }}-debug
112112
--${{ matrix.zts && 'enable' || 'disable' }}-zts
113-
${{ matrix.asan && 'CFLAGS="-fsanitize=undefined,address -fno-sanitize=function -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-fsanitize=undefined,address -fno-sanitize=function" CC=clang CXX=clang++ --disable-opcache-jit' || '' }}
113+
${{ matrix.asan && 'CFLAGS="-fsanitize=undefined,address -fno-sanitize=function -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-fsanitize=undefined,address -fno-sanitize=function" CC=clang CXX=clang++ --disable-opcache-jit' || 'CFLAGS="-fcf-protection=full" LDFLAGS="-Wl,-z,cet-report=error"' }}
114114
skipSlow: ${{ matrix.asan }}
115115
- name: make
116116
run: make -j$(/usr/bin/nproc) >/dev/null
@@ -123,6 +123,8 @@ jobs:
123123
if: matrix.asan == false
124124
uses: ./.github/actions/test-linux
125125
- name: Test ${{ matrix.asan && 'OpCache' || 'Tracing JIT' }}
126+
env:
127+
GLIBC_TUNABLES: ${{ !matrix.asan && 'glibc.cpu.hwcaps=SHSTK' || '' }}
126128
uses: ./.github/actions/test-linux
127129
with:
128130
jitType: ${{ matrix.asan && 'disable' || 'tracing' }}

0 commit comments

Comments
 (0)