Skip to content

Commit 787cfad

Browse files
committed
Enable SHSTK in CI
1 parent 7615111 commit 787cfad

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

.github/workflows/nightly.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122
fail-fast: false
123123
matrix:
124124
branch: ${{ fromJson(needs.GENERATE_MATRIX.outputs.branches) }}
125-
configuration_parameters: ['']
125+
configuration_parameters: ['CFLAGS="-fcf-protection=full" LDFLAGS="-Wl,-z,cet-report=error"']
126126
debug: [true, false]
127127
name: ['']
128128
run_tests_parameters: ['']
@@ -163,12 +163,16 @@ jobs:
163163
uses: ./.github/actions/setup-x64
164164
- name: Test
165165
uses: ./.github/actions/test-linux
166+
env:
167+
GLIBC_TUNABLES: 'glibc.cpu.hwcaps=SHSTK'
166168
with:
167169
runTestsParameters: >-
168170
${{ matrix.run_tests_parameters }}
169171
idleCpu: ${{ matrix.asan && 'true' || 'false' }}
170172
- name: Test Tracing JIT
171173
uses: ./.github/actions/test-linux
174+
env:
175+
GLIBC_TUNABLES: 'glibc.cpu.hwcaps=SHSTK'
172176
with:
173177
jitType: tracing
174178
runTestsParameters: >-

.github/workflows/push.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ jobs:
123123
configurationParameters: >-
124124
--${{ matrix.debug && 'enable' || 'disable' }}-debug
125125
--${{ matrix.zts && 'enable' || 'disable' }}-zts
126-
${{ matrix.asan && 'CFLAGS="-fsanitize=undefined,address -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-fsanitize=undefined,address" CC=clang-16 CXX=clang++-16' || '' }}
126+
${{ matrix.asan && 'CFLAGS="-fsanitize=undefined,address -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-fsanitize=undefined,address" CC=clang-16 CXX=clang++-16' || 'CFLAGS="-fcf-protection=full" LDFLAGS="-Wl,-z,cet-report=error"' }}
127127
skipSlow: ${{ matrix.asan }}
128128
- name: make
129129
run: make -j$(/usr/bin/nproc) >/dev/null
@@ -135,8 +135,12 @@ jobs:
135135
- name: Test
136136
if: matrix.asan == false
137137
uses: ./.github/actions/test-linux
138+
env:
139+
GLIBC_TUNABLES: 'glibc.cpu.hwcaps=SHSTK'
138140
- name: Test Tracing JIT
139141
uses: ./.github/actions/test-linux
142+
env:
143+
GLIBC_TUNABLES: ${{ !matrix.asan && 'glibc.cpu.hwcaps=SHSTK' || '' }}
140144
with:
141145
jitType: tracing
142146
runTestsParameters: >-

0 commit comments

Comments
 (0)