diff options
| author | Jan Niklas Hasse <jhasse@bixense.com> | 2024-03-20 16:34:44 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-20 16:34:44 (GMT) |
| commit | 9279832b28f2a7be30245d503b2ba974c3487a48 (patch) | |
| tree | 4f0c04205fc450244df1393d9d37bce6374c3d18 | |
| parent | 86997c40abca7e882e0902f01af6cd80eb69e3a4 (diff) | |
| parent | 7712e30548059def780a5ba6f02a722ef57e1f5b (diff) | |
| download | Ninja-9279832b28f2a7be30245d503b2ba974c3487a48.zip Ninja-9279832b28f2a7be30245d503b2ba974c3487a48.tar.gz Ninja-9279832b28f2a7be30245d503b2ba974c3487a48.tar.bz2 | |
Merge pull request #2399 from jhasse/github-actions-ubuntu-update
GitHub Actions: Update Ubuntu versions to 20.04, 22.04 and 24.04
| -rw-r--r-- | .github/workflows/linux.yml | 2 | ||||
| -rw-r--r-- | appveyor.yml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index b08e831..fdebf0b 100644 --- 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 index ecc9f98..505e142 100644 --- 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 |