From b2d0372ae692662dd36b2d4a691ee75a0a658ef8 Mon Sep 17 00:00:00 2001 From: Rasmus Karlsson Date: Sun, 21 Feb 2021 15:43:24 +0100 Subject: [PATCH] Revert old test workflow changes --- .github/workflows/test.yml | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4418e43cd..4df5156b3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -27,12 +27,6 @@ jobs: path: ../Qt key: ${{ runner.os }}-QtCache-20201005 - - name: Cache conan - uses: actions/cache@v2.1.4 - with: - key: ${{ runner.os }}-conan-root-${{ hashFiles('**/conanfile.txt') }} - path: ~/.conan - # LINUX - name: Install p7zip (Ubuntu) if: startsWith(matrix.os, 'ubuntu') @@ -52,7 +46,6 @@ jobs: sudo apt-get update sudo apt-get -y install \ cmake \ - virtualenv \ rapidjson-dev \ libssl-dev \ libboost-dev \ @@ -72,19 +65,21 @@ jobs: - name: Create build directory (Ubuntu) if: startsWith(matrix.os, 'ubuntu') - run: mkdir build-test + run: | + mkdir build-test shell: bash - name: Build (Ubuntu) if: startsWith(matrix.os, 'ubuntu') run: | - cmake -DBUILD_TESTS=ON -DBUILD_APP=OFF .. - make -j + cmake -DBUILD_TESTS=On -DBUILD_APP=OFF .. + cmake --build . --config Release working-directory: build-test shell: bash - name: Test (Ubuntu) if: startsWith(matrix.os, 'ubuntu') - run: ./bin/chatterino-test --platform minimal + run: | + ./bin/chatterino-test --platform minimal working-directory: build-test shell: bash