From 491b80163b4e22507a52ed9d41c578fb1a42667d Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Thu, 24 Oct 2019 15:42:27 -0400 Subject: [PATCH] Drop extra parts, add pip --- .github/workflows/tests.yml | 31 ------------------------------- .travis.yml | 4 ++++ 2 files changed, 4 insertions(+), 31 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ab0abbacc..fb9b941dd 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -23,34 +23,3 @@ jobs: run: git diff --exit-code if: always() - gcc_48: - name: GCC 4.8 - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v1 - - # Inspired by https://github.com/onqtam/doctest/pull/285/files/875052e18cf5f5f0b9176e59f847b6205f3efb78 - - name: Prepare environment - run: | - sudo apt-get update - sudo apt-get install -y g++-4.8 g++-4.8-multilib - echo "::set-env name=CC::gcc-4.8" - echo "::set-env name=CXX::g++-4.8" - - - name: Create Build Environment - run: cmake -E make_directory ${{runner.workspace}}/build - - - name: Configure CMake - shell: bash - working-directory: ${{runner.workspace}}/build - run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE - - - name: Build - working-directory: ${{runner.workspace}}/build - shell: bash - run: cmake --build . --config $BUILD_TYPE - - - name: Test - working-directory: ${{runner.workspace}}/build - shell: bash - run: ctest -C $BUILD_TYPE diff --git a/.travis.yml b/.travis.yml index 071b8ffb3..3d1228a3b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,6 +68,10 @@ matrix: # GCC 4.8 and Conan - compiler: gcc dist: bionic + addons: + apt: + packages: + - python3-pip install: - python3 -VV - python3 -m pip install --user conan