Merge pull request #85 from cblichmann:main

PiperOrigin-RevId: 367217172
Change-Id: I147ba51ac643d0f6d3a92c1147cef7f91d24271d
This commit is contained in:
Copybara-Service 2021-04-07 07:40:51 -07:00
commit 6edd16f1b3
2 changed files with 43 additions and 3 deletions

View File

@ -7,10 +7,37 @@ env:
jobs:
build:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04, ubuntu-18.04]
include:
- os: ubuntu-20.04
compiler: clang
compiler-version: 11
ignore-errors: false
- os: ubuntu-20.04
compiler: clang
compiler-version: 10
ignore-errors: false
- os: ubuntu-18.04
compiler: clang
compiler-version: "6.0"
# This compiler is supported only on a best-effort basis
ignore-errors: true
- os: ubuntu-20.04
compiler: gcc
compiler-version: 10
ignore-errors: false
- os: ubuntu-20.04
compiler: gcc
compiler-version: 9
ignore-errors: false
- os: ubuntu-18.04
compiler: gcc
compiler-version: 7
ignore-errors: false
runs-on: ${{ matrix.os }}
continue-on-error: ${{ matrix.ignore-errors }}
steps:
- uses: actions/checkout@v2
@ -18,6 +45,20 @@ jobs:
- name: Install ninja-build tool
uses: seanmiddleditch/gha-setup-ninja@v3
- name: Install/configure Clang compiler toolchain
if: matrix.compiler == 'clang'
run: |
sudo apt-get install -qy clang-${{matrix.compiler-version}}
echo "CXX=clang++-${{matrix.compiler-version}}" >> $GITHUB_ENV
echo "CC=clang-${{matrix.compiler-version}}" >> $GITHUB_ENV
- name: Install/configure GCC compiler toolchain
if: matrix.compiler == 'gcc'
run: |
sudo apt-get install -qy g++-${{matrix.compiler-version}}
echo "CXX=g++-${{matrix.compiler-version}}" >> $GITHUB_ENV
echo "CC=gcc-${{matrix.compiler-version}}" >> $GITHUB_ENV
- name: Create Build Environment
run: |
pip3 install absl-py clang

View File

@ -47,7 +47,6 @@ std::string Syscall::GetArchDescription(sapi::cpu::Architecture arch) {
case sapi::cpu::kArm:
return "[Arm-32]";
default:
LOG(ERROR) << "Unknown CPU architecture: " << arch;
return absl::StrFormat("[UNKNOWN_ARCH:%d]", arch);
}
}