Skip to content
Permalink
Browse files

ci: simplified .travis.yml, added clang8

  • Loading branch information
JaCzekanski committed Aug 17, 2019
1 parent e9d17e3 commit 7dc0c855f0ac87be8a6588bc275cce3c109ea428
Showing with 26 additions and 18 deletions.
  1. +15 −14 .travis.yml
  2. +2 −2 .travis/linux/build.sh
  3. +3 −1 .travis/linux/run-container.sh
  4. +6 −1 premake5.lua
@@ -1,31 +1,32 @@
language: cpp
cache: ccache
git:
depth: 1

matrix:
include:
- name: Linux Clang6
os: linux
sudo: required
dist: trusty
cache: ccache
script: "./.travis/linux/run-container.sh"
after_success: "./.travis/notify-discord.sh success $WEBHOOK_URL"
after_failure: "./.travis/notify-discord.sh failure $WEBHOOK_URL"
services: docker
script: "./.travis/linux/run-container.sh 6"
- name: Linux Clang8
os: linux
services: docker
script: "./.travis/linux/run-container.sh 8"
- name: Android
os: linux
sudo: required
dist: trusty
cache: ccache
services: docker
before_install: openssl aes-256-cbc -K $encrypted_7333c7dd5b15_key -iv $encrypted_7333c7dd5b15_iv -in android/avocado.keystore.enc -out android/avocado.keystore -d
script: "./.travis/android/run-container.sh"
after_success: "./.travis/notify-discord.sh success $WEBHOOK_URL"
after_failure: "./.travis/notify-discord.sh failure $WEBHOOK_URL"
- name: macOS
os: osx
osx_image: xcode10.1
cache: ccache
install: "./.travis/macos/install-dependencies.sh"
script: "./.travis/macos/build.sh"
after_success: "./.travis/notify-discord.sh success $WEBHOOK_URL"
after_failure: "./.travis/notify-discord.sh failure $WEBHOOK_URL"


after_success: "./.travis/notify-discord.sh success $WEBHOOK_URL"
after_failure: "./.travis/notify-discord.sh failure $WEBHOOK_URL"

notifications:
email: false
@@ -14,8 +14,8 @@ export CXX="ccache clang++-6.0 -fcolor-diagnostics"
ccache --set-config=sloppiness=pch_defines,time_macros

# Download SDL2
apt update
apt install -y --no-install-recommends libsdl2-dev
apt -qq update
apt -qq install -y --no-install-recommends libsdl2-dev > /dev/null

# Generate Makefile
premake5 gmake
@@ -1,11 +1,13 @@
#!/bin/bash -ex
# Run in Travis to launch container

CLANG_VERSION=${1:-6}

mkdir -p "$HOME/.ccache"

docker run \
-v $(pwd):/home/build \
-v "$HOME/.ccache":/root/.ccache \
avocadoemu/linux-clang6 \
avocadoemu/linux-clang$CLANG_VERSION \
/bin/bash -ex /home/build/.travis/linux/build.sh

@@ -61,7 +61,6 @@ filter {}
defines { 'BUILD_ARCH="%{cfg.system}"' }
exceptionhandling "On"
rtti "On"
warnings "Extra"

filter "system:windows"
platforms {"x86", "x64"}
@@ -94,6 +93,12 @@ filter "platforms:arm"
architecture "arm"
vectorextensions "NEON"

filter "action:gmake"
buildoptions {
"-Wall",
"-Wextra",
}

filter "kind:*App"
targetdir "build/%{cfg.buildcfg}_%{cfg.platform}"

0 comments on commit 7dc0c85

Please sign in to comment.
You can’t perform that action at this time.