Skip to content

Commit 9fb88d5

Browse files
authored
Merge pull request #1152 from KFilipek/disable_2004
[CI] Disable legacy GHA Image - Ubuntu 20.04
2 parents eae8d63 + d97349f commit 9fb88d5

File tree

2 files changed

+5
-21
lines changed

2 files changed

+5
-21
lines changed

.github/workflows/reusable_basic.yml

+1-10
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
name: Ubuntu
1818
strategy:
1919
matrix:
20-
os: ['ubuntu-20.04', 'ubuntu-22.04']
20+
os: ['ubuntu-22.04', 'ubuntu-24.04']
2121
build_type: [Debug, Release]
2222
compiler: [{c: gcc, cxx: g++}]
2323
shared_library: ['OFF']
@@ -27,15 +27,6 @@ jobs:
2727
disable_hwloc: ['OFF']
2828
link_hwloc_statically: ['OFF']
2929
include:
30-
- os: 'ubuntu-20.04'
31-
build_type: Release
32-
compiler: {c: gcc-7, cxx: g++-7}
33-
shared_library: 'OFF'
34-
level_zero_provider: 'ON'
35-
cuda_provider: 'ON'
36-
install_tbb: 'ON'
37-
disable_hwloc: 'OFF'
38-
link_hwloc_statically: 'OFF'
3930
- os: 'ubuntu-22.04'
4031
build_type: Release
4132
compiler: {c: clang, cxx: clang++}

.github/workflows/reusable_fast.yml

+4-11
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ jobs:
4343
build_tests: 'ON'
4444
extra_build_options: '-DCMAKE_BUILD_TYPE=Release'
4545
simple_cmake: 'ON'
46-
# simplest CMake ubuntu-20.04
47-
- os: ubuntu-20.04
46+
# simplest CMake ubuntu-22.04
47+
- os: ubuntu-22.04
4848
build_tests: 'ON'
4949
extra_build_options: '-DCMAKE_BUILD_TYPE=Release'
5050
simple_cmake: 'ON'
@@ -69,19 +69,12 @@ jobs:
6969
run: vcpkg install
7070
shell: pwsh # Specifies PowerShell as the shell for running the script.
7171

72-
- name: Install dependencies (ubuntu-latest)
73-
if: matrix.os == 'ubuntu-latest'
72+
- name: Install dependencies
73+
if: matrix.os != 'windows-latest'
7474
run: |
7575
sudo apt-get update
7676
sudo apt-get install -y cmake libhwloc-dev libnuma-dev libtbb-dev
7777
78-
- name: Install dependencies (ubuntu-20.04)
79-
if: matrix.os == 'ubuntu-20.04'
80-
run: |
81-
sudo apt-get update
82-
sudo apt-get install -y cmake libnuma-dev libtbb-dev
83-
.github/scripts/install_hwloc.sh # install hwloc-2.3.0 instead of hwloc-2.1.0 present in the OS package
84-
8578
- name: Configure CMake
8679
if: matrix.simple_cmake == 'OFF'
8780
run: >

0 commit comments

Comments
 (0)