use ubuntu 24.04 LTS with g++14 instead of 20.04 with g++9

tesseract-ocr · Dec 31, 2024 · 014b9d0 · 014b9d0
1 parent 13c966b
commit 014b9d0
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/.github/workflows/autotools-openmp.yml b/.github/workflows/autotools-openmp.yml
@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { name: 20.04-openmp, os: ubuntu-20.04 }
+          - { name: 24.04-openmp, os: ubuntu-24.04 }
           - { name: 22.04-openmp, os: ubuntu-22.04 }
 
     steps:

diff --git a/.github/workflows/autotools.yml b/.github/workflows/autotools.yml
@@ -15,10 +15,10 @@ jobs:
         config:
           - { name: ubuntu-22.04-clang-15-autotools, os: ubuntu-22.04, cxx: clang++-15 } #installed
 
+          - { name: ubuntu-24.04-gcc-14-autotools, os: ubuntu-24.04, cxx: g++-14 } #installed
           - { name: ubuntu-22.04-gcc-12-autotools, os: ubuntu-22.04, cxx: g++-12 } #installed
           - { name: ubuntu-22.04-gcc-11-autotools, os: ubuntu-22.04, cxx: g++-11 } #installed
           - { name: ubuntu-20.04-gcc-10-autotools, os: ubuntu-20.04, cxx: g++-10 } #installed
-          - { name: ubuntu-20.04-gcc-9-autotools, os: ubuntu-20.04, cxx: g++-9 } #installed
 
     steps:
     - uses: actions/checkout@v4

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -19,11 +19,9 @@ jobs:
           - { name: macos-15-clang-cmake, os: macos-15, cxx: clang++ } # default
 
           - { name: ubuntu-22.04-clang-15-cmake, os: ubuntu-22.04, cxx: clang++-15 } #installed
-
+          - { name: ubuntu-24.04-gcc-12-cmake, os: ubuntu-24.04, cxx: g++-14 } #installed
           - { name: ubuntu-22.04-gcc-12-cmake, os: ubuntu-22.04, cxx: g++-12 } #installed
-          - { name: ubuntu-22.04-gcc-11-cmake, os: ubuntu-22.04, cxx: g++-11 } #installed
           - { name: ubuntu-20.04-gcc-10-cmake, os: ubuntu-20.04, cxx: g++-10 } #installed
-          - { name: ubuntu-20.04-gcc-9-cmake, os: ubuntu-20.04, cxx: g++-9 } #installed
 
     steps:
       - name: Install compilers on Linux

diff --git a/.github/workflows/unittest-disablelegacy.yml b/.github/workflows/unittest-disablelegacy.yml
@@ -14,8 +14,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        compiler: [ g++, clang++-15 ]
-        os: [ ubuntu-22.04 ]
+        compiler: [ g++, clang++-18 ]
+        os: [ ubuntu-24.04 ]
 
     steps:
     - uses: actions/checkout@v4

diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
@@ -23,7 +23,7 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { name: ubuntu-20.04-gcc-unittest, os: ubuntu-20.04, cxx: g++, cxxflags: '-g -O2 -fsanitize=address,undefined' }
+          - { name: ubuntu-24.04-gcc-unittest, os: ubuntu-24.04, cxx: g++, cxxflags: '-g -O2 -fsanitize=address,undefined' }
           - { name: ubuntu-22.04-clang-unittest, os: ubuntu-22.04, cxx: clang++, cxxflags: '-g -O2 -fsanitize=address,undefined -stdlib=libc++' }
     steps:
     - uses: actions/checkout@v4