Skip to content

Commit

Permalink
Bump to ubuntu 20 for all gcc versions that support it.
Browse files Browse the repository at this point in the history
That leaves two 18.04 tests that will have to be removed
in about 6 months when 18.04 is fully deprecated.
  • Loading branch information
pramsey committed Nov 18, 2022
1 parent 1924bd0 commit 97ebb51
Showing 1 changed file with 17 additions and 17 deletions.
34 changes: 17 additions & 17 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ jobs:
packages: g++
cmake: 3.15.*
cmake_extra: '-DBUILD_BENCHMARKS=ON'
os: ubuntu-18.04
os: ubuntu-latest

- cxx_compiler: g++-5
c_compiler: gcc-5
build_type: Release
Expand All @@ -54,7 +54,7 @@ jobs:
arch: 64
packages: 'g++-7-multilib gcc-7-multilib'
cmake: 3.13.*
os: ubuntu-18.04
os: ubuntu-20.04

- cxx_compiler: g++-8
c_compiler: gcc-8
Expand All @@ -63,7 +63,7 @@ jobs:
arch: 64
packages: 'g++-8-multilib gcc-8-multilib'
cmake: 3.13.*
os: ubuntu-18.04
os: ubuntu-20.04

- cxx_compiler: g++-9
c_compiler: gcc-9
Expand All @@ -72,17 +72,17 @@ jobs:
arch: 64
packages: 'g++-9-multilib gcc-9-multilib'
cmake: 3.13.*
os: ubuntu-18.04
os: ubuntu-20.04

- cxx_compiler: g++-10
c_compiler: gcc-10
build_type: Release
cxxstd: 11
arch: 64
packages: 'g++-10-multilib gcc-10-multilib'
cmake: 3.13.*
os: ubuntu-18.04
os: ubuntu-20.04

- cxx_compiler: g++-11
c_compiler: gcc-11
build_type: Release
Expand All @@ -91,7 +91,7 @@ jobs:
packages: 'g++'
cmake: 3.22.*
os: ubuntu-22.04

- cxx_compiler: g++-11
c_compiler: gcc-11
build_type: Release
Expand All @@ -108,7 +108,7 @@ jobs:
arch: 64
packages: 'clang-7'
cmake: 3.13.*
os: ubuntu-18.04
os: ubuntu-20.04

- cxx_compiler: clang++-8
c_compiler: clang-8
Expand All @@ -117,7 +117,7 @@ jobs:
arch: 64
packages: 'clang-8'
cmake: 3.13.*
os: ubuntu-18.04
os: ubuntu-20.04

- cxx_compiler: clang++-9
c_compiler: clang-9
Expand All @@ -126,8 +126,8 @@ jobs:
arch: 64
packages: 'clang-9'
cmake: 3.13.*
os: ubuntu-18.04
os: ubuntu-20.04

- cxx_compiler: clang++-10
c_compiler: clang
build_type: Debug
Expand All @@ -136,7 +136,7 @@ jobs:
packages: 'clang'
cmake: 3.17.*
os: ubuntu-20.04

- cxx_compiler: clang++-10
c_compiler: clang
build_type: Release
Expand Down Expand Up @@ -323,7 +323,7 @@ jobs:
- xcode: 13.2.1
cxxstd: 20
build_type: Debug

runs-on: macos-11
steps:

Expand Down Expand Up @@ -367,7 +367,7 @@ jobs:
set -e
sudo -E apt-get update
sudo -E apt-get -yq --no-install-suggests --no-install-recommends install cppcheck
- name: 'Check Out'
uses: actions/checkout@v3

Expand All @@ -378,7 +378,7 @@ jobs:
cmake-subproject:
name: 'CMake Subproject'
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- name: 'Install'
run: |
Expand Down

0 comments on commit 97ebb51

Please sign in to comment.