Skip to content

Commit 868281c

Browse files
committed
Enable SHSTK in CI
1 parent 209eacf commit 868281c

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

.github/workflows/nightly.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ jobs:
9797
${{ matrix.configuration_parameters }}
9898
--${{ matrix.debug && 'enable' || 'disable' }}-debug
9999
--${{ matrix.zts && 'enable' || 'disable' }}-zts
100+
CFLAGS="-fcf-protection=full" LDFLAGS="-Wl,-z,cet-report=error"
100101
- name: make
101102
run: make -j$(/usr/bin/nproc) >/dev/null
102103
- name: make install
@@ -105,13 +106,17 @@ jobs:
105106
uses: ./.github/actions/setup-x64
106107
- name: Test
107108
uses: ./.github/actions/test-linux
109+
env:
110+
GLIBC_TUNABLES: 'glibc.cpu.hwcaps=SHSTK'
108111
with:
109112
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}
110113
runTestsParameters: >-
111114
${{ matrix.run_tests_parameters }}
112115
idleCpu: ${{ matrix.asan && 'true' || 'false' }}
113116
- name: Test Tracing JIT
114117
uses: ./.github/actions/test-linux
118+
env:
119+
GLIBC_TUNABLES: 'glibc.cpu.hwcaps=SHSTK'
115120
with:
116121
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Tracing JIT
117122
jitType: tracing

.github/workflows/push.yml

Lines changed: 5 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 -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-fsanitize=undefined,address" CC=clang CXX=clang++ --disable-opcache-jit' || '' }}
113+
${{ matrix.asan && 'CFLAGS="-fsanitize=undefined,address -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-fsanitize=undefined,address" 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
@@ -122,10 +122,14 @@ jobs:
122122
- name: Test
123123
if: matrix.asan == false
124124
uses: ./.github/actions/test-linux
125+
env:
126+
GLIBC_TUNABLES: 'glibc.cpu.hwcaps=SHSTK'
125127
with:
126128
testArtifacts: ${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}
127129
- name: Test ${{ matrix.asan && 'OpCache' || 'Tracing JIT' }}
128130
uses: ./.github/actions/test-linux
131+
env:
132+
GLIBC_TUNABLES: ${{ !matrix.asan && 'glibc.cpu.hwcaps=SHSTK' || '' }}
129133
with:
130134
testArtifacts: ${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}${{ matrix.asan && '_ASAN' || '' }}_${{ matrix.asan && 'OpCache' || 'Tracing JIT' }}
131135
jitType: ${{ matrix.asan && 'disable' || 'tracing' }}

0 commit comments

Comments
 (0)