aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoseph Davies <deledrius@gmail.com>2021-06-24 19:06:52 -0700
committerAlec Thomas <alec@swapoff.org>2021-06-25 19:05:28 +1000
commitab5ca0693e500a3f9ce988c0061e1888f0c3dc36 (patch)
tree4b91a13834098823b36a36c2551af8a63aefa6ce
parent82ab2d304ef5e6933cf6622721f086a1f4731e80 (diff)
Fix broken automated builds.
Replaces Travis-CI and AppVeyor scripts with Github Actions workflow.
-rw-r--r--.github/workflows/default-ci.yaml38
-rw-r--r--.travis.yml17
-rw-r--r--appveyor.yml10
-rwxr-xr-xscripts/travis.sh5
4 files changed, 38 insertions, 32 deletions
diff --git a/.github/workflows/default-ci.yaml b/.github/workflows/default-ci.yaml
new file mode 100644
index 0000000..0a7c944
--- /dev/null
+++ b/.github/workflows/default-ci.yaml
@@ -0,0 +1,38 @@
+name: CMake Build
+
+on:
+ push:
+ branches: [ master ]
+ pull_request:
+ branches: [ master ]
+
+jobs:
+ build:
+ runs-on: ${{ matrix.os }}
+ strategy:
+ matrix:
+ os: [ubuntu-latest, windows-latest, macos-latest]
+ build_type: [Release, Debug]
+ shared_library: [True, False]
+ exclude:
+ # Building a shared library is currently unsupported on Windows.
+ - os: windows-latest
+ shared_library: True
+
+ steps:
+ - uses: actions/checkout@v2
+
+ - name: Configure CMake
+ # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required when using a single-configuration generator such as make.
+ # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
+ run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DENTITYX_BUILD_SHARED=${{matrix.shared_library}}
+
+ - name: Build
+ # Build the library with the given configuration
+ run: cmake --build ${{github.workspace}}/build --config ${{matrix.build_type}}
+
+ - name: Test
+ working-directory: ${{github.workspace}}/build
+ # Execute tests defined by the CMake configuration.
+ # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+ run: ctest -C ${{matrix.build_type}}
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index c06dba4..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-language: cpp
-compiler:
- - clang
- - gcc
-before_install:
- - sudo apt-add-repository -y ppa:jkeiren/ppa
- - if test $CC = gcc; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi
- - sudo add-apt-repository -y ppa:george-edison55/precise-backports
- - sudo apt-get update -qq
- - if test $CC = gcc; then sudo apt-get install --yes --force-yes gcc-4.7 g++-4.7; fi
- - if test $CC = gcc; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.7 20; fi
- - if test $CC = gcc; then sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.7 20; fi
- - if test $CC = gcc; then sudo update-alternatives --config gcc; fi
- - if test $CC = gcc; then sudo update-alternatives --config g++; fi
- - sudo apt-get install --yes --force-yes cmake cmake-data
-
-script: ./scripts/travis.sh
diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644
index 313ca18..0000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-version: 1.0.{build}
-image: Visual Studio 2015 CTP 6
-build_script:
-- cmd: >-
- cmake -DENTITYX_BUILD_TESTING=1 -DENTITYX_BUILD_SHARED=0
-
- cmake --build . --target ALL_BUILD --config Release
-
- cmake --build . --target RUN_TESTS --config Release
-
diff --git a/scripts/travis.sh b/scripts/travis.sh
deleted file mode 100755
index c8b2a17..0000000
--- a/scripts/travis.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash -e
-
-cmake -DCMAKE_BUILD_TYPE=Debug -DENTITYX_BUILD_TESTING=1
-make VERBOSE=1
-make test || cat Testing/Temporary/LastTest.log