Skip to content

Commit 1c092c4

Browse files
authored
Merge pull request #547 from ldorau/Run_the_simplest_CMake_CI_build_on_Ubuntu_20.04
Run the simplest CMake CI build also on Ubuntu 20.04
2 parents 2d74808 + 8f2f040 commit 1c092c4

File tree

1 file changed

+16
-3
lines changed

1 file changed

+16
-3
lines changed

.github/workflows/pr_push.yml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,18 @@ jobs:
4242
build_tests: 'OFF'
4343
extra_build_options: '-DCMAKE_BUILD_TYPE=Release -DUMF_BUILD_BENCHMARKS=ON'
4444
simple_cmake: 'OFF'
45-
# simplest CMake
45+
# simplest CMake on ubuntu-latest
4646
- os: ubuntu-latest
4747
disjoint: 'OFF'
4848
build_tests: 'ON'
4949
extra_build_options: '-DCMAKE_BUILD_TYPE=Release'
5050
simple_cmake: 'ON'
51+
# simplest CMake ubuntu-20.04
52+
- os: ubuntu-20.04
53+
disjoint: 'OFF'
54+
build_tests: 'ON'
55+
extra_build_options: '-DCMAKE_BUILD_TYPE=Release'
56+
simple_cmake: 'ON'
5157
runs-on: ${{matrix.os}}
5258

5359
steps:
@@ -67,14 +73,21 @@ jobs:
6773
run: vcpkg install
6874
shell: pwsh # Specifies PowerShell as the shell for running the script.
6975

70-
- name: Install apt packages
76+
- name: Install apt packages (ubuntu-latest)
7177
if: matrix.os == 'ubuntu-latest'
7278
run: |
7379
sudo apt-get update
7480
sudo apt-get install -y cmake libjemalloc-dev libhwloc-dev libnuma-dev libtbb-dev
7581
82+
- name: Install apt packages (ubuntu-20.04)
83+
if: matrix.os == 'ubuntu-20.04'
84+
run: |
85+
sudo apt-get update
86+
sudo apt-get install -y cmake libjemalloc-dev libnuma-dev libtbb-dev
87+
.github/scripts/install_hwloc.sh # install hwloc-2.3.0 instead of hwloc-2.1.0 present in the OS package
88+
7689
- name: Set ptrace value for IPC test (on Linux only)
77-
if: matrix.os == 'ubuntu-latest'
90+
if: ${{ matrix.os == 'ubuntu-latest' || matrix.os == 'ubuntu-20.04' }}
7891
run: sudo bash -c "echo 0 > /proc/sys/kernel/yama/ptrace_scope"
7992

8093
- name: Configure CMake

0 commit comments

Comments
 (0)