From 8ea33311da920aaebf90e8793773e000bc33dbcf Mon Sep 17 00:00:00 2001 From: greg Date: Sun, 7 Nov 2021 12:31:34 -0500 Subject: [PATCH] remove travis.yml, add CI icon --- .github/workflows/main.yml | 4 +- .travis.yml | 118 ------------------------------------- README.md | 3 +- 3 files changed, 4 insertions(+), 121 deletions(-) delete mode 100644 .travis.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f3c522d..2ce053c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,6 +20,6 @@ jobs: - name: Build and test env: CXX: ${{ matrix.compiler }} - CXXFLAGS: ${{ matrix.flags }} ${{ matrix.optimize }} + COMPILERFLAGS: ${{ matrix.flags }} ${{ matrix.optimize }} run: | - mkdir build && cd build && cmake -DPHMAP_BUILD_TESTS=ON -DPHMAP_BUILD_EXAMPLES=ON -DCMAKE_CXX_COMPILER=${CXX} -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON .. && cmake --build . && make test + mkdir build && cd build && cmake -DPHMAP_BUILD_TESTS=ON -DPHMAP_BUILD_EXAMPLES=ON -DCMAKE_CXX_COMPILER=${CXX} -DCXXFLAGS="${COMPILERFLAGS}" -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON .. && cmake --build . && make test diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index f1c5e95..0000000 --- a/.travis.yml +++ /dev/null @@ -1,118 +0,0 @@ -language: cpp -matrix: - include: - - - os: osx - compiler: gcc - env: COMPILER='g++' CXX_FLAGS='-std=c++11' - - - os: osx - compiler: clang - env: COMPILER='clang++' CXX_FLAGS='-std=c++11' - -# - os: linux -# compiler: gcc -# env: COMPILER='g++' CXX_FLAGS='-std=c++11' - -# - os: linux -# compiler: clang -# env: COMPILER='clang++' CXX_FLAGS='-std=c++11' - - - os: linux - compiler: gcc - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-5 - env: COMPILER='g++-5' CXX_FLAGS='-std=c++11' - - - os: linux - compiler: gcc - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-6 - env: COMPILER='g++-6' CXX_FLAGS='-std=c++11' - - - os: linux - compiler: gcc - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-7 - env: COMPILER='g++-7' CXX_FLAGS='-std=c++11' - - - os: linux - compiler: gcc - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-8 - env: COMPILER='g++-8' CXX_FLAGS='-std=c++14' - - - os: linux - compiler: gcc - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-8 - env: COMPILER='g++-8' CXX_FLAGS='-std=c++17' - -# - os: linux -# compiler: clang -# addons: -# apt: -# sources: -# - llvm-toolchain-trusty-3.9 -# packages: -# - clang-3.9 -# env: COMPILER='clang++-3.9' CXX_FLAGS='-std=c++11' - -# - os: linux -# compiler: clang -# addons: -# apt: -# sources: -# - llvm-toolchain-trusty-4.0 -# packages: -# - clang-4.0 -# env: COMPILER='clang++-4.0' CXX_FLAGS='-std=c++11' - - - os: linux - compiler: clang - addons: - apt: - sources: - - llvm-toolchain-trusty-5.0 - - ubuntu-toolchain-r-test - packages: - - clang-5.0 - - g++-7 - env: COMPILER='clang++-5.0' CXX_FLAGS='-std=c++14' - - - os: linux - compiler: clang - addons: - apt: - sources: - - llvm-toolchain-trusty-5.0 - - ubuntu-toolchain-r-test - packages: - - clang-5.0 - - g++-7 - env: COMPILER='clang++-5.0' CXX_FLAGS='-std=c++17' - -dist: trusty - -script: - mkdir build && cd build && cmake -DPHMAP_BUILD_TESTS=ON -DPHMAP_BUILD_EXAMPLES=ON -DCMAKE_CXX_COMPILER=${COMPILER} -DCXXFLAGS="${CXX_FLAGS}" -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON .. && cmake --build . && make test diff --git a/README.md b/README.md index 630c13a..f603725 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ -# The Parallel Hashmap [![Build Status](https://travis-ci.com/greg7mdp/parallel-hashmap.svg?branch=master)](https://travis-ci.com/greg7mdp/parallel-hashmap) [![Build Status](https://ci.appveyor.com/api/projects/status/86kc657lp4cja8ju?svg=true)](https://ci.appveyor.com/project/greg7mdp/parallel-hashmap) +# The Parallel Hashmap [ +![Linux/MacOS](https://github.com/greg7mdp/parallel-hashmap/actions/workflows/main.yml/badge.svg) [![Build Status](https://ci.appveyor.com/api/projects/status/86kc657lp4cja8ju?svg=true)](https://ci.appveyor.com/project/greg7mdp/parallel-hashmap) ## Overview