Skip to content

Commit aaab191

Browse files
committed
Revert circle ci changes (take 2).
Signed-off-by: John Plevyak <[email protected]>
1 parent ff6a6fe commit aaab191

File tree

1 file changed

+31
-83
lines changed

1 file changed

+31
-83
lines changed

.circleci/config.yml

+31-83
Original file line numberDiff line numberDiff line change
@@ -10,114 +10,62 @@ executors:
1010
working_directory: /source
1111

1212
jobs:
13-
release:
13+
api:
1414
executor: ubuntu-build
15-
environment:
16-
BAZEL_BUILD_EXTRA_OPTIONS: "--local_ram_resources=8192 --local_cpu_resources=6 --define wasm=enabled" # v8 + WAVM (build only)
1715
steps:
1816
- run: rm -rf /home/circleci/project/.git # CircleCI git caching is likely broken
1917
- checkout
20-
- run: ci/do_circle_ci.sh bazel.release.server_only
18+
- run: ci/do_circle_ci.sh bazel.api
19+
- add_ssh_keys:
20+
fingerprints:
21+
- "fb:f3:fe:be:1c:b2:ec:b6:25:f9:7b:a6:87:54:02:8c"
22+
- run: ci/api_mirror.sh
2123
- store_artifacts:
2224
path: /build/envoy/generated
2325
destination: /
2426

25-
# all_tests:
26-
# executor: ubuntu-build
27-
# environment:
28-
# BAZEL_BUILD_EXTRA_OPTIONS: "--local_ram_resources=8192 --local_cpu_resources=6 --flaky_test_attempts=5"
29-
# steps:
30-
# - run: rm -rf /home/circleci/project/.git # CircleCI git caching is likely broken
31-
# - checkout
32-
# - restore_cache:
33-
# keys:
34-
# - tests-bazel-cache-{{ checksum "WORKSPACE" }}-{{ checksum "bazel/repository_locations.bzl" }}
35-
# - run: ci/do_circle_ci.sh bazel.dev
36-
# - save_cache:
37-
# key: tests-bazel-cache-{{ checksum "WORKSPACE" }}-{{ checksum "bazel/repository_locations.bzl" }}
38-
# paths:
39-
# - /home/circleci/.cache/bazel
40-
# when: always # Save cache even when some tests fail.
41-
42-
asan:
27+
go_control_plane_mirror:
4328
executor: ubuntu-build
44-
environment:
45-
BAZEL_BUILD_EXTRA_OPTIONS: "--local_ram_resources=8192 --local_cpu_resources=6"
46-
BAZEL_TEST_TARGETS: "//test/extensions/access_loggers/wasm/... //test/extensions/filters/http/wasm/... //test/extensions/filters/network/wasm/... //test/extensions/bootstrap/wasm/... //test/extensions/common/wasm/..."
4729
steps:
4830
- run: rm -rf /home/circleci/project/.git # CircleCI git caching is likely broken
4931
- checkout
50-
- run: ci/do_circle_ci.sh bazel.asan ${BAZEL_TEST_TARGETS}
51-
- store_artifacts:
52-
path: /build/envoy/generated
53-
destination: /
32+
- run: ci/do_circle_ci.sh bazel.api
33+
- add_ssh_keys:
34+
fingerprints:
35+
- "9d:3b:fe:7c:09:3b:ce:a9:6a:de:de:41:fb:6b:52:62"
36+
- run: ci/go_mirror.sh
5437

55-
tsan:
38+
filter_example_mirror:
5639
executor: ubuntu-build
57-
environment:
58-
BAZEL_BUILD_EXTRA_OPTIONS: "--local_ram_resources=8192 --local_cpu_resources=6"
59-
BAZEL_TEST_TARGETS: "//test/extensions/access_loggers/wasm/... //test/extensions/filters/http/wasm/... //test/extensions/filters/network/wasm/... //test/extensions/bootstrap/wasm/... //test/extensions/common/wasm/..."
6040
steps:
6141
- run: rm -rf /home/circleci/project/.git # CircleCI git caching is likely broken
6242
- checkout
63-
- run: ci/do_circle_ci.sh bazel.tsan ${BAZEL_TEST_TARGETS}
64-
- store_artifacts:
65-
path: /build/envoy/generated
66-
destination: /
43+
- add_ssh_keys:
44+
fingerprints:
45+
- "f6:f9:df:90:9c:4b:5f:9c:f4:69:fd:42:94:ff:88:24"
46+
- run: ci/filter_example_mirror.sh
6747

68-
coverage:
48+
docs:
6949
executor: ubuntu-build
70-
environment:
71-
BAZEL_BUILD_EXTRA_OPTIONS: "--local_ram_resources=8192 --local_cpu_resources=6"
72-
BAZEL_TEST_TARGETS: "//test/extensions/access_loggers/wasm/... //test/extensions/filters/http/wasm/... //test/extensions/filters/network/wasm/... //test/extensions/bootstrap/wasm/... //test/extensions/common/wasm/..."
73-
VALIDATE_COVERAGE: 0
7450
steps:
7551
- run: rm -rf /home/circleci/project/.git # CircleCI git caching is likely broken
7652
- checkout
77-
- run:
78-
command:
79-
ci/do_circle_ci.sh bazel.coverage ${BAZEL_TEST_TARGETS}
80-
no_output_timeout: 60m
53+
- run: ci/do_circle_ci.sh docs
54+
- add_ssh_keys:
55+
fingerprints:
56+
- "44:c7:a1:9e:f4:9e:a5:33:11:f1:0e:79:e1:55:c9:04"
57+
- run: docs/publish.sh
8158
- store_artifacts:
82-
path: /build/envoy/generated
83-
destination: /
84-
85-
format:
86-
executor: ubuntu-build
87-
steps:
88-
- run: rm -rf /home/circleci/project/.git # CircleCI git caching is likely broken
89-
- checkout
90-
- run: ci/check_and_fix_format.sh
91-
92-
macos:
93-
macos:
94-
xcode: "11.0.0"
95-
environment:
96-
BAZEL_TEST_TARGETS: "//test/extensions/access_loggers/wasm/... //test/extensions/filters/http/wasm/... //test/extensions/filters/network/wasm/... //test/extensions/bootstrap/wasm/... //test/extensions/common/wasm/..."
97-
CC: clang
98-
CXX: clang++
99-
steps:
100-
- run: sudo sntp -sS time.apple.com
101-
- run: rm -rf /home/circleci/project/.git # CircleCI git caching is likely broken
102-
- checkout
103-
- restore_cache:
104-
keys:
105-
- macos-bazel-cache-{{ checksum "bazel/repository_locations.bzl" }}
106-
- run: ci/mac_ci_setup.sh
107-
- run: ci/mac_ci_steps.sh ${BAZEL_TEST_TARGETS}
108-
- save_cache:
109-
key: macos-bazel-cache-{{ checksum "bazel/repository_locations.bzl" }}
110-
paths:
111-
- /private/var/tmp/_bazel_distiller/
59+
path: generated/docs
11260

11361
workflows:
11462
version: 2
11563
all:
11664
jobs:
117-
- release
118-
# - all_tests
119-
- asan
120-
- tsan
121-
- coverage
122-
- format
123-
- macos
65+
- api
66+
- go_control_plane_mirror
67+
- filter_example_mirror
68+
- docs:
69+
filters:
70+
tags:
71+
only: /^v.*/

0 commit comments

Comments
 (0)