Skip to content

Commit

Permalink
Merge pull request #271 from ngtcp2/gha-ubuntu-24.04
Browse files Browse the repository at this point in the history
GHA: Bump Ubuntu runner to 24.04
  • Loading branch information
tatsuhiro-t authored Oct 14, 2024
2 parents 7f40779 + 2d99b8a commit dd4a3b8
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 11 deletions.
23 changes: 13 additions & 10 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
build:
strategy:
matrix:
os: [ubuntu-22.04, macos-13, macos-14]
os: [ubuntu-24.04, macos-13, macos-14]
compiler: [gcc, clang]
buildtool: [autotools, distcheck, cmake]
exclude:
Expand All @@ -26,8 +26,8 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install \
g++-12 \
clang-15 \
g++-14 \
clang-18 \
autoconf \
automake \
autotools-dev \
Expand All @@ -48,8 +48,8 @@ jobs:
- name: Setup clang (Linux)
if: runner.os == 'Linux' && matrix.compiler == 'clang'
run: |
echo 'CC=clang-15' >> $GITHUB_ENV
echo 'CXX=clang++-15' >> $GITHUB_ENV
echo 'CC=clang-18' >> $GITHUB_ENV
echo 'CXX=clang++-18' >> $GITHUB_ENV
- name: Setup clang (MacOS)
if: runner.os == 'macOS' && matrix.compiler == 'clang'
run: |
Expand All @@ -58,8 +58,8 @@ jobs:
- name: Setup gcc (Linux)
if: runner.os == 'Linux' && matrix.compiler == 'gcc'
run: |
echo 'CC=gcc-12' >> $GITHUB_ENV
echo 'CXX=g++-12' >> $GITHUB_ENV
echo 'CC=gcc-14' >> $GITHUB_ENV
echo 'CXX=g++-14' >> $GITHUB_ENV
- name: Setup gcc (MacOS)
if: runner.os == 'macOS' && matrix.compiler == 'gcc'
run: |
Expand Down Expand Up @@ -108,16 +108,19 @@ jobs:
matrix:
host: [x86_64-w64-mingw32, i686-w64-mingw32]

runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

env:
HOST: ${{ matrix.host }}

steps:
- uses: actions/checkout@v4
- name: Linux setup
- name: Prepare for i386
if: matrix.host == 'i686-w64-mingw32'
run: |
sudo dpkg --add-architecture i386
- name: Linux setup
run: |
sudo apt-get update
sudo apt-get install \
gcc-mingw-w64 \
Expand Down Expand Up @@ -181,7 +184,7 @@ jobs:
permissions:
contents: write

runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ permissions:

jobs:
stale:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- uses: actions/stale@v9
Expand Down

0 comments on commit dd4a3b8

Please sign in to comment.