summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTatsuhiro Tsujikawa <404610+tatsuhiro-t@users.noreply.github.com>2022-05-22 12:19:37 +0900
committerGitHub <noreply@github.com>2022-05-22 12:19:37 +0900
commit190ce569e44b0cf95418379afc94890bcdf607fe (patch)
treebb8b8031e8f5b1e3a4dfe86edcc07a54a077da88
parent73cf6d110d9868838776265da51329ff28f5f0b2 (diff)
parente0ef02d243f7ef721757433b3e9c044f3cf6aa2c (diff)
Merge pull request #1929 from aria2/bump-ubuntu
Bump workflow ubuntu
-rw-r--r--.github/workflows/build.yml25
1 files changed, 18 insertions, 7 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fb5a9031..98256f1a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,7 +8,7 @@ jobs:
strategy:
matrix:
- os: [ubuntu-20.04, macos-11]
+ os: [ubuntu-22.04, macos-11]
compiler: [gcc, clang]
steps:
@@ -17,7 +17,8 @@ jobs:
if: runner.os == 'Linux'
run: |
sudo apt-get install \
- g++-8 \
+ g++-11 \
+ clang-12 \
autoconf \
automake \
autotools-dev \
@@ -35,16 +36,26 @@ jobs:
run: |
brew install cppunit gettext openssl libssh2 c-ares sqlite3 \
autoconf automake pkg-config libtool
- - name: Setup clang
- if: matrix.compiler == 'clang'
+ - name: Setup clang (Linux)
+ 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: |
echo 'CC=clang' >> $GITHUB_ENV
echo 'CXX=clang++' >> $GITHUB_ENV
- - name: Setup gcc
+ - name: Setup gcc (Linux)
if: runner.os == 'Linux' && matrix.compiler == 'gcc'
run: |
- echo 'CC=gcc-8' >> $GITHUB_ENV
- echo 'CXX=g++-8' >> $GITHUB_ENV
+ echo 'CC=gcc-11' >> $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
run: |
autoreconf -i