github-repos/benchmark
1
0
Fork 0
mirror of https://github.com/google/benchmark.git synced 2025-03-23 07:30:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

add g++-6 to ubuntu-14.04 (#1144)

Browse Source 
* add g++-6 to ubuntu-14.04

* fix syntax

* fix yamllint errors for build-and-test

* fix 'add-apt-repository' command not found

* make 'run tests' explicit

* enable testing and run both release and debug

* oops
This commit is contained in:
Dominic Hamon 2021-05-07 14:23:05 +01:00 committed by GitHub
parent 17948a78ee
commit 551a21bad0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 64 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
.github/workflows/build-and-test.yml vendored
View File

@ -7,7 +7,8 @@ on:
branches: [master] branches: [master]
jobs: jobs:
# TODO: add 32-bit builds (g++ and clang++) for ubuntu (requires g++-multilib and libc6:i386) # TODO: add 32-bit builds (g++ and clang++) for ubuntu
# (requires g++-multilib and libc6:i386)
# TODO: add coverage build (requires lcov) # TODO: add coverage build (requires lcov)
# TODO: add clang + libc++ builds for ubuntu # TODO: add clang + libc++ builds for ubuntu
# TODO: add clang + ubsan/asan/msan + libc++ builds for ubuntu # TODO: add clang + ubsan/asan/msan + libc++ builds for ubuntu
@ -63,12 +64,29 @@ jobs:
matrix: matrix:
build_type: ['Release', 'Debug'] build_type: ['Release', 'Debug']
compiler: [g++-4.8, clang++-3.6] compiler: [g++-4.8, clang++-3.6]
include:
- compiler: g++-6
build_type: 'Debug'
run_tests: true
- compiler: g++-6
build_type: 'Release'
run_tests: true
container: ubuntu:14.04 container: ubuntu:14.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: install required bits - name: install required bits
run: sudo apt update && sudo apt -y install clang-3.6 cmake3 g++-4.8 git run: |
sudo apt update
sudo apt -y install clang-3.6 cmake3 g++-4.8 git
- name: install other bits
if: ${{ matrix.compiler }} == g++-6
run: |
sudo apt -y install software-properties-common
sudo add-apt-repository -y "ppa:ubuntu-toolchain-r/test"
sudo apt update
sudo apt -y install g++-6
- name: create build environment - name: create build environment
run: cmake -E make_directory $GITHUB_WORKSPACE/_build run: cmake -E make_directory $GITHUB_WORKSPACE/_build
@ -80,17 +98,17 @@ jobs:
working-directory: ${{ github.workspace }}/_build working-directory: ${{ github.workspace }}/_build
run: > run: >
cmake $GITHUB_WORKSPACE cmake $GITHUB_WORKSPACE
-DBENCHMARK_ENABLE_TESTING=off -DBENCHMARK_ENABLE_TESTING=${{ matrix.run_tests }}
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
#-DBENCHMARK_DOWNLOAD_DEPENDENCIES=ON -DBENCHMARK_DOWNLOAD_DEPENDENCIES=${{ matrix.run_tests }}
- name: build - name: build
shell: bash shell: bash
working-directory: ${{ github.workspace }}/_build working-directory: ${{ github.workspace }}/_build
run: cmake --build . --config ${{ matrix.build_type }} run: cmake --build . --config ${{ matrix.build_type }}
# - name: test - name: test
# shell: bash if: ${{ matrix.run_tests }}
# working-directory: ${{ github.workspace }}/_build shell: bash
# run: ctest -C ${{ matrix.build_type }} -VV working-directory: ${{ github.workspace }}/_build
run: ctest -C ${{ matrix.build_type }} -VV