Merge pull request ninja-build#2399 from jhasse/github-actions-ubuntu…

…-update GitHub Actions: Update Ubuntu versions to 20.04, 22.04 and 24.04
pkitszel · Mar 20, 2024 · 9279832 · 9279832
2 parents 86997c4 + 7712e30
commit 9279832
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -133,7 +133,7 @@ jobs:
       image: ${{ matrix.image }}
     strategy:
       matrix:
-        image: ['ubuntu:14.04', 'ubuntu:16.04', 'ubuntu:18.04']
+        image: ['ubuntu:20.04', 'ubuntu:22.04', 'ubuntu:24.04']
     steps:
     - uses: actions/checkout@v2
     - name: Install dependencies

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,7 +1,7 @@
 version: 1.0.{build}
 image:
   - Visual Studio 2017
-  - Ubuntu1804
+  - Ubuntu2204
 
 environment:
   CLICOLOR_FORCE: 1
@@ -14,7 +14,7 @@ matrix:
   exclude:
     - image: Visual Studio 2017
       MSYSTEM: LINUX
-    - image: Ubuntu1804
+    - image: Ubuntu2204
       MSYSTEM: MINGW64
 
 for:
@@ -30,7 +30,7 @@ for:
       ./misc/ninja_syntax_test.py 2>&1\n\"@"
   - matrix:
       only:
-        - image: Ubuntu1804
+        - image: Ubuntu2204
     build_script:
       - ./configure.py --bootstrap
       - ./ninja all