Skip to content

Commit 2596896

Browse files
committed
Enable SHSTK in CI
1 parent 35c9b71 commit 2596896

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
@@ -95,6 +95,7 @@ jobs:
9595
${{ matrix.configuration_parameters }}
9696
--${{ matrix.debug && 'enable' || 'disable' }}-debug
9797
--${{ matrix.zts && 'enable' || 'disable' }}-zts
98+
CFLAGS="-fcf-protection=full" LDFLAGS="-Wl,-z,cet-report=error"
9899
- name: make
99100
run: make -j$(/usr/bin/nproc) >/dev/null
100101
- name: make install
@@ -103,13 +104,17 @@ jobs:
103104
uses: ./.github/actions/setup-x64
104105
- name: Test
105106
uses: ./.github/actions/test-linux
107+
env:
108+
GLIBC_TUNABLES: 'glibc.cpu.hwcaps=SHSTK'
106109
with:
107110
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}
108111
runTestsParameters: >-
109112
${{ matrix.run_tests_parameters }}
110113
idleCpu: ${{ matrix.asan && 'true' || 'false' }}
111114
- name: Test Tracing JIT
112115
uses: ./.github/actions/test-linux
116+
env:
117+
GLIBC_TUNABLES: 'glibc.cpu.hwcaps=SHSTK'
113118
with:
114119
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Tracing JIT
115120
jitType: tracing

.github/workflows/push.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122
configurationParameters: >-
123123
--${{ matrix.debug && 'enable' || 'disable' }}-debug
124124
--${{ matrix.zts && 'enable' || 'disable' }}-zts
125-
${{ matrix.asan && 'CFLAGS="-fsanitize=undefined,address -DZEND_TRACK_ARENA_ALLOC" LDFLAGS="-fsanitize=undefined,address" CC=clang-16 CXX=clang++-16' || '' }}
125+
${{ 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"' }}
126126
skipSlow: ${{ matrix.asan }}
127127
- name: make
128128
run: make -j$(/usr/bin/nproc) >/dev/null
@@ -134,10 +134,14 @@ jobs:
134134
- name: Test
135135
if: matrix.asan == false
136136
uses: ./.github/actions/test-linux
137+
env:
138+
GLIBC_TUNABLES: 'glibc.cpu.hwcaps=SHSTK'
137139
with:
138140
testArtifacts: ${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}
139141
- name: Test Tracing JIT
140142
uses: ./.github/actions/test-linux
143+
env:
144+
GLIBC_TUNABLES: ${{ !matrix.asan && 'glibc.cpu.hwcaps=SHSTK' || '' }}
141145
with:
142146
testArtifacts: ${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}${{ matrix.asan && '_ASAN' || '' }}_Tracing JIT
143147
jitType: tracing

0 commit comments

Comments
 (0)