Skip to content

Commit

Permalink
Update Travis to Xcode 10.1 (Apple) and Swift 4.2.1 (Linux).
Browse files Browse the repository at this point in the history
Closes #130.
Fixes #119.

RELNOTES: None.
PiperOrigin-RevId: 229928942
  • Loading branch information
keith authored and allevato committed Jan 18, 2019
1 parent 93ed615 commit fdfdfc8
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@ matrix:
dist: trusty
sudo: required
env:
- BAZEL=RELEASE SWIFT_VERSION=4.1.2 CC=clang TARGETS="//examples/... -//examples/apple/..."
- BAZEL=RELEASE SWIFT_VERSION=4.2.1 CC=clang TARGETS="//examples/... -//examples/apple/..."
- os: linux
dist: trusty
sudo: required
env:
- BAZEL=HEAD SWIFT_VERSION=4.1.2 CC=clang TARGETS="//examples/... -//examples/apple/..."
- BAZEL=HEAD SWIFT_VERSION=4.2.1 CC=clang TARGETS="//examples/... -//examples/apple/..."
- os: osx
osx_image: xcode9.4
osx_image: xcode10.1
env:
- BAZEL=RELEASE TARGETS=//examples/...
- os: osx
osx_image: xcode9.4
osx_image: xcode10.1
env:
- BAZEL=HEAD TARGETS=//examples/...

Expand Down
6 changes: 6 additions & 0 deletions .travis/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,12 @@ if [[ -n "${BAZEL:-}" ]]; then
--verbose_failures
--action_env=PATH
)

# Can be removed when https://github.com/bazelbuild/bazel/pull/7151 is released
if [[ $OSTYPE == darwin* ]]; then
ALL_BUILD_ARGS+=("--host_cpu=darwin_x86_64")
fi

if [[ -n "${BUILD_ARGS:-}" ]]; then
ALL_BUILD_ARGS+=(${BUILD_ARGS})
fi
Expand Down

0 comments on commit fdfdfc8

Please sign in to comment.