Browse Source

CI: specify meson requirement in travis file, not script

tags/2020-12-27
falkTX 1 year ago
parent
commit
442ae46cd7
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 8 additions and 7 deletions
  1. +7
    -5
      .travis.yml
  2. +1
    -2
      .travis/install.sh

+ 7
- 5
.travis.yml View File

@@ -1,32 +1,34 @@
language: cpp

os: linux

dist: bionic

jobs:
include:
# linux native build
- os: linux
compiler: gcc
dist: bionic
env:
- TARGET="linux"

# linux with win32 cross-compilation
- os: linux
compiler: gcc
dist: bionic
env:
- TARGET="win32"

# linux with win64 cross-compilation
- os: linux
compiler: gcc
dist: bionic
env:
- TARGET="win64"

# macOS native build
- os: osx
compiler: gcc
addons:
homebrew:
packages:
- meson
env:
- TARGET="macos"



+ 1
- 2
.travis/install.sh View File

@@ -2,9 +2,8 @@

set -e

# Special macOS native handling
# nothing to do for macOS native
if [ "${TARGET}" = "macos" ]; then
brew install meson || true
exit 0
fi



Loading…
Cancel
Save