Skip to content

Commit 167a66e

Browse files
authored
Merge pull request intel#92 from elbeno/update-workflow
👷 Make 13 the default GCC version
2 parents 5ce1060 + ba6380e commit 167a66e

File tree

2 files changed

+35
-5
lines changed

2 files changed

+35
-5
lines changed

.github/workflows/test.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,27 @@ jobs:
190190
path: ~/cpm-cache
191191
key: ${{runner.os}}-${{env.cache-name}}-${{ hashFiles('**/CMakeLists.txt', 'cmake/**') }}
192192

193+
# https://github.com/actions/runner-images/issues/9524
194+
- name: Fix kernel mmap rnd bits
195+
# Asan in llvm 14 provided in ubuntu 22.04 is incompatible with
196+
# high-entropy ASLR in much newer kernels that GitHub runners are
197+
# using leading to random crashes: https://reviews.llvm.org/D148280
198+
run: sudo sysctl vm.mmap_rnd_bits=28
199+
193200
- name: Build app and run tests
194201
working-directory: ${{github.workspace}}/test/application
195202
run: cmake --build build -t cpp_tests
203+
204+
merge_ok:
205+
runs-on: ${{ github.repository_owner == 'intel' && 'intel-' || '' }}ubuntu-22.04
206+
needs: [test, sanitize]
207+
if: ${{ !cancelled() }}
208+
steps:
209+
- name: Enable merge
210+
if: >-
211+
${{
212+
contains(needs.*.result, 'failure')
213+
|| contains(needs.*.result, 'cancelled')
214+
|| contains(needs.*.result, 'skipped')
215+
}}
216+
run: exit 1

ci/.github/workflows/unit_tests.yml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414
CMAKE_GENERATOR: Ninja
1515
DEFAULT_CXX_STANDARD: 20
1616
DEFAULT_LLVM_VERSION: 18
17-
DEFAULT_GCC_VERSION: 12
17+
DEFAULT_GCC_VERSION: 13
1818

1919
concurrency:
2020
group: ${{ github.head_ref || github.run_id }}
@@ -226,9 +226,9 @@ jobs:
226226
install: wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && sudo ./llvm.sh 18
227227
toolchain_root: "/usr/lib/llvm-18"
228228
- compiler: gcc
229-
cc: "gcc-12"
230-
cxx: "g++-12"
231-
install: sudo apt update && sudo apt install -y gcc-12
229+
cc: "gcc-13"
230+
cxx: "g++-13"
231+
install: sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test && sudo apt update && sudo apt install -y gcc-13 g++-13
232232
toolchain_root: "/usr"
233233

234234
steps:
@@ -266,6 +266,13 @@ jobs:
266266
path: ~/cpm-cache
267267
key: ${{runner.os}}-${{env.cache-name}}-${{ hashFiles('**/CMakeLists.txt', 'cmake/**') }}
268268

269+
# https://github.com/actions/runner-images/issues/9524
270+
- name: Fix kernel mmap rnd bits
271+
# Asan in llvm 14 provided in ubuntu 22.04 is incompatible with
272+
# high-entropy ASLR in much newer kernels that GitHub runners are
273+
# using leading to random crashes: https://reviews.llvm.org/D148280
274+
run: sudo sysctl vm.mmap_rnd_bits=28
275+
269276
- name: Build Unit Tests
270277
run: cmake --build ${{github.workspace}}/build -t unit_tests
271278

@@ -275,7 +282,9 @@ jobs:
275282
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
276283

277284
- name: Install build tools
278-
run: sudo apt update && sudo apt install -y gcc-${{env.DEFAULT_GCC_VERSION}} ninja-build valgrind
285+
run: |
286+
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
287+
sudo apt update && sudo apt install -y gcc-${{env.DEFAULT_GCC_VERSION}} g++-${{env.DEFAULT_GCC_VERSION}} ninja-build valgrind
279288
280289
- name: Restore CPM cache
281290
env:

0 commit comments

Comments
 (0)