Skip to content

Commit

Permalink
Updated aws-c-io to v0.3.12, gets darwin/windows fixes (#61)
Browse files Browse the repository at this point in the history
* Updated aws-c-io to v0.3.12, gets darwin/windows fixes

* Update travis config to use java language image and removed homebrew shenanigans

* Updated aws-c-io to get PKI fix
  • Loading branch information
Justin Boswell authored Jun 14, 2019
1 parent dcb42da commit 931ea0f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 34 deletions.
14 changes: 4 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,18 @@ language: c

os: osx
osx_image:
- xcode8
- xcode9.2
- xcode10.1
compiler: clang
language: java
jdk:
- openjdk11

# use the addon to do the update of homebrew, or else ruby versions get confused
addons:
homebrew:
update: true
taps: AdoptOpenJDK/openjdk
packages:
- ninja
- maven
- adoptopenjdk8

cache:
directories:
- ./packages
- cmake

script:
- ./codebuild/common-macos.sh -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
2 changes: 1 addition & 1 deletion aws-common-runtime/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ if (UNIX AND NOT APPLE)
endif()

set(AWS_C_IO_URL "https://github.com/awslabs/aws-c-io.git")
set(AWS_C_IO_SHA "v0.3.11")
set(AWS_C_IO_SHA "v0.3.13")
include(BuildAwsCIO)

set(AWS_C_COMPRESSION_URL "https://github.com/awslabs/aws-c-compression.git")
Expand Down
24 changes: 1 addition & 23 deletions codebuild/common-macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,6 @@

# Until CodeBuild supports macOS, this script is just used by Travis.

set -e
set -x

# ensure each required package is installed, if not, make a bottle for brew in ./packages
# so it will be cached for future runs. If the cache is ever blown away, this will update
# the packages as well
# If the bottles are already in ./packages, then just install them
function install_from_brew {
pushd ./packages
# usually the existing package is too old for one of the others, so uninstall
# and reinstall from the cache
brew uninstall --ignore-dependencies $1 || true
if [ ! -e $1*bottle*.tar.gz ]; then
brew install --build-bottle $1
brew bottle --json $1
brew uninstall --ignore-dependencies $1
fi
brew install $1*bottle*tar.gz
popd
}

install_from_brew sphinx-doc
install_from_brew cmake
set -ex

mvn -B compile

0 comments on commit 931ea0f

Please sign in to comment.