Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .azure-pipelines/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ resources:

jobs:
- job: BuildEnvoy
timeoutInMinutes: 120
timeoutInMinutes: 360
pool:
vmImage: 'Ubuntu 16.04'
container: envoy-build
Expand Down
12 changes: 0 additions & 12 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -175,17 +175,6 @@ jobs:
- run: docs/publish.sh
- store_artifacts:
path: generated/docs
mac:
macos:
xcode: "9.3.1"
environment:
BAZEL_REMOTE_CACHE: https://storage.googleapis.com/envoy-circleci-bazel-cache/
steps:
- run: sudo ntpdate -vu time.apple.com
- run: rm -rf /home/circleci/project/.git # CircleCI git caching is likely broken
- checkout
- run: ci/mac_ci_setup.sh
- run: ci/mac_ci_steps.sh

workflows:
version: 2
Expand Down Expand Up @@ -214,4 +203,3 @@ workflows:
filters:
tags:
only: /^v.*/
- mac
5 changes: 3 additions & 2 deletions ci/mac_ci_steps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ df -h
. "$(dirname "$0")"/setup_gcs_cache.sh

BAZEL_BUILD_OPTIONS="--curses=no --show_task_finish --verbose_failures ${BAZEL_BUILD_EXTRA_OPTIONS} \
--deleted_packages //test/extensions/quic_listeners/quiche/platform \
--action_env=PATH=/usr/local/bin:/opt/local/bin:/usr/bin:/bin"
# TODO(zuercher): remove --flaky_test_attempts when https://github.com/envoyproxy/envoy/issues/2428
# is resolved.
Expand All @@ -23,5 +24,5 @@ BAZEL_TEST_OPTIONS="${BAZEL_BUILD_OPTIONS} --test_output=all --flaky_test_attemp
# is somewhat more deterministic (rather than interleaving the build
# and test steps).

bazel build ${BAZEL_BUILD_OPTIONS} //source/... //test/integration/...
bazel test ${BAZEL_TEST_OPTIONS} //test/integration/...
bazel build ${BAZEL_BUILD_OPTIONS} //source/... //test/...
bazel test ${BAZEL_TEST_OPTIONS} //test/...