Merge pull request #1929 from aria2/bump-ubuntu

Bump workflow ubuntu
pull/1943/head
Tatsuhiro Tsujikawa 2022-05-22 12:19:37 +09:00 committed by GitHub
commit 190ce569e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 7 deletions

View File

@ -8,7 +8,7 @@ jobs:
strategy: strategy:
matrix: matrix:
os: [ubuntu-20.04, macos-11] os: [ubuntu-22.04, macos-11]
compiler: [gcc, clang] compiler: [gcc, clang]
steps: steps:
@ -17,7 +17,8 @@ jobs:
if: runner.os == 'Linux' if: runner.os == 'Linux'
run: | run: |
sudo apt-get install \ sudo apt-get install \
g++-8 \ g++-11 \
clang-12 \
autoconf \ autoconf \
automake \ automake \
autotools-dev \ autotools-dev \
@ -35,16 +36,26 @@ jobs:
run: | run: |
brew install cppunit gettext openssl libssh2 c-ares sqlite3 \ brew install cppunit gettext openssl libssh2 c-ares sqlite3 \
autoconf automake pkg-config libtool autoconf automake pkg-config libtool
- name: Setup clang - name: Setup clang (Linux)
if: matrix.compiler == 'clang' if: runner.os == 'Linux' && matrix.compiler == 'clang'
run: |
echo 'CC=clang-12' >> $GITHUB_ENV
echo 'CXX=clang++-12' >> $GITHUB_ENV
- name: Setup clang (MacOS)
if: runner.os == 'macOS' && matrix.compiler == 'clang'
run: | run: |
echo 'CC=clang' >> $GITHUB_ENV echo 'CC=clang' >> $GITHUB_ENV
echo 'CXX=clang++' >> $GITHUB_ENV echo 'CXX=clang++' >> $GITHUB_ENV
- name: Setup gcc - name: Setup gcc (Linux)
if: runner.os == 'Linux' && matrix.compiler == 'gcc' if: runner.os == 'Linux' && matrix.compiler == 'gcc'
run: | run: |
echo 'CC=gcc-8' >> $GITHUB_ENV echo 'CC=gcc-11' >> $GITHUB_ENV
echo 'CXX=g++-8' >> $GITHUB_ENV echo 'CXX=g++-11' >> $GITHUB_ENV
- name: Setup gcc (MacOS)
if: runner.os == 'macOS' && matrix.compiler == 'gcc'
run: |
echo 'CC=gcc' >> $GITHUB_ENV
echo 'CXX=g++' >> $GITHUB_ENV
- name: Libtool - name: Libtool
run: | run: |
autoreconf -i autoreconf -i