Skip to content

Commit

Permalink
workflows: Use Ubuntu 24.04
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelkuhn committed Jun 30, 2024
1 parent 0bf9918 commit 1fece1d
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 11 deletions.
40 changes: 30 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on: [push, pull_request]
jobs:
style:
name: Style
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 30
steps:
- name: Checkout
Expand All @@ -46,7 +46,7 @@ jobs:
compiler_version: 13.2.0
- dist: ubuntu-24.04
compiler: clang
compiler_version: 18.0.0
compiler_version: 18.1.3
- dist: ubuntu-22.04
compiler: gcc
compiler_version: 11.4.0
Expand Down Expand Up @@ -79,13 +79,21 @@ jobs:
./scripts/install-dependencies.sh
dependencies-containers:
name: Dependencies (Containers)
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
container: ${{ matrix.os.registry }}/${{ matrix.os.image }}
timeout-minutes: 180
strategy:
fail-fast: false
matrix:
os:
- image: ubuntu:24.04
registry: docker.io/library
compiler: gcc
compiler_version: 13.2.0
- image: ubuntu:24.04
registry: docker.io/library
compiler: clang
compiler_version: 18.1.3
- image: ubuntu:22.04
registry: docker.io/library
compiler: gcc
Expand All @@ -101,7 +109,7 @@ jobs:
persist-credentials: false
show-progress: false
- name: Install packages
if: ${{ matrix.os.image == 'ubuntu:22.04' }}
if: ${{ matrix.os.image == 'ubuntu:24.04' || matrix.os.image == 'ubuntu:22.04' }}
run: |
apt update
apt --yes --no-install-recommends install build-essential zstd
Expand Down Expand Up @@ -132,6 +140,12 @@ jobs:
fail-fast: false
matrix:
os:
- dist: ubuntu-24.04
compiler: gcc
compiler_version: 13.2.0
- dist: ubuntu-24.04
compiler: clang
compiler_version: 18.1.3
- dist: ubuntu-22.04
compiler: gcc
compiler_version: 11.4.0
Expand Down Expand Up @@ -167,7 +181,7 @@ jobs:
run: |
sudo apt update || true
sudo apt --yes --no-install-recommends install ninja-build pkgconf libglib2.0-dev libbson-dev libfabric-dev libgdbm-dev liblmdb-dev libsqlite3-dev libleveldb-dev libmongoc-dev libmariadb-dev librocksdb-dev libfuse3-dev libopen-trace-format-dev librados-dev
if test "${{ matrix.os.dist }}" = 'ubuntu-22.04'
if test "${{ matrix.os.dist }}" != 'ubuntu-20.04'
then
sudo apt --yes --no-install-recommends install meson
else
Expand Down Expand Up @@ -199,6 +213,12 @@ jobs:
fail-fast: false
matrix:
os:
- dist: ubuntu-24.04
compiler: gcc
compiler_version: 13.2.0
- dist: ubuntu-24.04
compiler: clang
compiler_version: 18.1.3
- dist: ubuntu-22.04
compiler: gcc
compiler_version: 11.4.0
Expand Down Expand Up @@ -299,7 +319,7 @@ jobs:
run: |
sudo apt update || true
sudo apt --yes --no-install-recommends install ninja-build pkgconf libglib2.0-dev libbson-dev libfabric-dev libgdbm-dev liblmdb-dev libsqlite3-dev libleveldb-dev libmongoc-dev libmariadb-dev librocksdb-dev libfuse3-dev libopen-trace-format-dev librados-dev
if test "${{ matrix.os.dist }}" = 'ubuntu-22.04'
if test "${{ matrix.os.dist }}" != 'ubuntu-20.04'
then
sudo apt --yes --no-install-recommends install meson
else
Expand Down Expand Up @@ -366,7 +386,7 @@ jobs:
./scripts/setup.sh stop
doxygen:
name: Doxygen
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 30
steps:
- name: Checkout
Expand All @@ -391,7 +411,7 @@ jobs:
# FIXME Increase coverage (currently, only one configuration runs)
name: Coverage
needs: dependencies
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 60
steps:
- name: Checkout
Expand All @@ -408,7 +428,7 @@ jobs:
uses: actions/cache/restore@v4
with:
path: dependencies
key: ubuntu-22.04-gcc-11.4.0-${{ hashFiles('scripts/spack', 'scripts/install-dependencies.sh') }}
key: ubuntu-24.04-gcc-13.2.0-${{ hashFiles('scripts/spack', 'scripts/install-dependencies.sh') }}
- name: Check dependencies
if: ${{ steps.cache.outputs.cache-hit != 'true' }}
run: |
Expand Down Expand Up @@ -443,7 +463,7 @@ jobs:
publish:
name: Publish
needs: [doxygen, coverage]
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
permissions:
contents: write
if: ${{ github.ref == 'refs/heads/master' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ on:
jobs:
ubuntu-dev:
name: Ubuntu Development Container
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
permissions:
packages: write
timeout-minutes: 60
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@ jobs:
fail-fast: false
matrix:
os:
- dist: ubuntu-24.04
compiler: gcc
compiler_version: 13.2.0
- dist: ubuntu-24.04
compiler: clang
compiler_version: 18.1.3
- dist: ubuntu-22.04
compiler: gcc
compiler_version: 11.4.0
Expand Down

0 comments on commit 1fece1d

Please sign in to comment.