From ae63bc7dab7373c41dfe40486bbcfda572f05733 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Mon, 1 Apr 2019 16:03:52 -0600 Subject: [PATCH] travis: add macos and windows CI --- .travis.yml | 25 ++++++++++++++++--------- .travis/build.sh | 8 ++++---- bootstrap.macos.toml | 3 +++ 3 files changed, 23 insertions(+), 13 deletions(-) create mode 100644 bootstrap.macos.toml diff --git a/.travis.yml b/.travis.yml index 600d3a2..655884b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,18 @@ -os: linux -dist: trusty -sudo: required -services: - - docker +matrix: + include: + - os: linux + language: cpp + sudo: required + dist: trusty + services: docker + install: docker pull ubuntu:18.04 + script: docker run -v $(pwd):/liftinstall ubuntu:18.04 /bin/bash -ex /liftinstall/.travis/build.sh -install: - - docker pull ubuntu:18.04 + - os: osx + language: rust + osx_image: xcode10 + script: cargo build -script: - - docker run -v $(pwd):/liftinstall ubuntu:18.04 /bin/bash -ex /liftinstall/.travis/build.sh + - os: windows + language: rust + script: cargo build diff --git a/.travis/build.sh b/.travis/build.sh index 0373a92..d28fef7 100644 --- a/.travis/build.sh +++ b/.travis/build.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash -cd /liftinstall +cd /liftinstall || exit 1 -apt update -apt install -y libwebkit2gtk-4.0-dev libssl-dev +apt-get update +apt-get install -y libwebkit2gtk-4.0-dev libssl-dev -curl https://sh.rustup.rs -sSf | sh -s -- -y +curl https://build.travis-ci.org/files/rustup-init.sh -sSf | sh -s -- -y export PATH=~/.cargo/bin:$PATH cargo build diff --git a/bootstrap.macos.toml b/bootstrap.macos.toml new file mode 100644 index 0000000..07911fc --- /dev/null +++ b/bootstrap.macos.toml @@ -0,0 +1,3 @@ +# fake configuration for CI purpose only +name = "yuzu" +target_url = "https://raw.githubusercontent.com/j-selby/test-installer/master/config.linux.v2.toml"