Skip to content

Commit 3cb62bf

Browse files
algojackalgojack
committed
Reenabling tests
1 parent d30557b commit 3cb62bf

File tree

1 file changed

+99
-118
lines changed

1 file changed

+99
-118
lines changed

‎.circleci/config.yml‎

Lines changed: 99 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -58,96 +58,96 @@ workflows:
5858
parameters:
5959
platform: ["amd64", "arm64", "mac_amd64"]
6060

61-
# - test:
62-
# name: << matrix.platform >>_test
63-
# matrix:
64-
# <<: *matrix-default
65-
# requires:
66-
# - << matrix.platform >>_build
67-
# filters: &filters-default
68-
# branches:
69-
# ignore:
70-
# - /rel\/.*/
71-
# - /hotfix\/.*/
72-
73-
# - test_nightly:
74-
# name: << matrix.platform >>_test_nightly
75-
# matrix:
76-
# <<: *matrix-default
77-
# requires:
78-
# - << matrix.platform >>_build
79-
# filters: &filters-nightly
80-
# branches:
81-
# only:
82-
# - /rel\/.*/
83-
# - /hotfix\/.*/
84-
# context: slack-secrets
85-
86-
# - integration:
87-
# name: << matrix.platform >>_integration
88-
# matrix:
89-
# <<: *matrix-default
90-
# requires:
91-
# - << matrix.platform >>_build
92-
# filters:
93-
# <<: *filters-default
94-
95-
# - integration_nightly:
96-
# name: << matrix.platform >>_integration_nightly
97-
# matrix:
98-
# <<: *matrix-default
99-
# requires:
100-
# - << matrix.platform >>_build
101-
# filters:
102-
# <<: *filters-nightly
103-
# context: slack-secrets
104-
105-
# - e2e_expect:
106-
# name: << matrix.platform >>_e2e_expect
107-
# matrix:
108-
# <<: *matrix-default
109-
# requires:
110-
# - << matrix.platform >>_build
111-
# filters:
112-
# <<: *filters-default
113-
114-
# - e2e_expect_nightly:
115-
# name: << matrix.platform >>_e2e_expect_nightly
116-
# matrix:
117-
# <<: *matrix-default
118-
# requires:
119-
# - << matrix.platform >>_build
120-
# filters:
121-
# <<: *filters-nightly
122-
# context: slack-secrets
123-
124-
# - e2e_subs:
125-
# name: << matrix.platform >>_e2e_subs
126-
# matrix:
127-
# <<: *matrix-default
128-
# requires:
129-
# - << matrix.platform >>_build
130-
# filters:
131-
# <<: *filters-default
132-
133-
# - e2e_subs_nightly:
134-
# name: << matrix.platform >>_e2e_subs_nightly
135-
# matrix:
136-
# <<: *matrix-default
137-
# requires:
138-
# - << matrix.platform >>_build
139-
# filters:
140-
# <<: *filters-nightly
141-
# context: slack-secrets
142-
143-
# - tests_verification_job:
144-
# name: << matrix.platform >>_<< matrix.job_type >>_verification
145-
# matrix:
146-
# parameters:
147-
# platform: ["amd64"] #, "arm64", "mac_amd64"]
148-
# job_type: ["integration_nightly"] #["test", "test_nightly", "integration", "integration_nightly", "e2e_expect", "e2e_expect_nightly"]
149-
# requires:
150-
# - << matrix.platform >>_<< matrix.job_type >>
61+
- test:
62+
name: << matrix.platform >>_test
63+
matrix:
64+
<<: *matrix-default
65+
requires:
66+
- << matrix.platform >>_build
67+
filters: &filters-default
68+
branches:
69+
ignore:
70+
- /rel\/.*/
71+
- /hotfix\/.*/
72+
73+
- test_nightly:
74+
name: << matrix.platform >>_test_nightly
75+
matrix:
76+
<<: *matrix-default
77+
requires:
78+
- << matrix.platform >>_build
79+
filters: &filters-nightly
80+
branches:
81+
only:
82+
- /rel\/.*/
83+
- /hotfix\/.*/
84+
context: slack-secrets
85+
86+
- integration:
87+
name: << matrix.platform >>_integration
88+
matrix:
89+
<<: *matrix-default
90+
requires:
91+
- << matrix.platform >>_build
92+
filters:
93+
<<: *filters-default
94+
95+
- integration_nightly:
96+
name: << matrix.platform >>_integration_nightly
97+
matrix:
98+
<<: *matrix-default
99+
requires:
100+
- << matrix.platform >>_build
101+
filters:
102+
<<: *filters-nightly
103+
context: slack-secrets
104+
105+
- e2e_expect:
106+
name: << matrix.platform >>_e2e_expect
107+
matrix:
108+
<<: *matrix-default
109+
requires:
110+
- << matrix.platform >>_build
111+
filters:
112+
<<: *filters-default
113+
114+
- e2e_expect_nightly:
115+
name: << matrix.platform >>_e2e_expect_nightly
116+
matrix:
117+
<<: *matrix-default
118+
requires:
119+
- << matrix.platform >>_build
120+
filters:
121+
<<: *filters-nightly
122+
context: slack-secrets
123+
124+
- e2e_subs:
125+
name: << matrix.platform >>_e2e_subs
126+
matrix:
127+
<<: *matrix-default
128+
requires:
129+
- << matrix.platform >>_build
130+
filters:
131+
<<: *filters-default
132+
133+
- e2e_subs_nightly:
134+
name: << matrix.platform >>_e2e_subs_nightly
135+
matrix:
136+
<<: *matrix-default
137+
requires:
138+
- << matrix.platform >>_build
139+
filters:
140+
<<: *filters-nightly
141+
context: slack-secrets
142+
143+
- tests_verification_job:
144+
name: << matrix.platform >>_<< matrix.job_type >>_verification
145+
matrix:
146+
parameters:
147+
platform: ["amd64", "arm64", "mac_amd64"]
148+
job_type: ["test", "test_nightly", "integration", "integration_nightly", "e2e_expect", "e2e_expect_nightly"]
149+
requires:
150+
- << matrix.platform >>_<< matrix.job_type >>
151151

152152
- upload_binaries:
153153
name: << matrix.platform >>_upload_binaries
@@ -160,15 +160,15 @@ workflows:
160160
# - << matrix.platform >>_e2e_subs_nightly
161161
# - codegen_verification
162162
# REMOVE BELOW
163-
# - << matrix.platform >>_test_verification
164-
# - << matrix.platform >>_integration_verification
165-
# - << matrix.platform >>_e2e_expect_verification
166-
# - << matrix.platform >>_e2e_subs
167-
- << matrix.platform >>_build
163+
- << matrix.platform >>_test_verification
164+
- << matrix.platform >>_integration_verification
165+
- << matrix.platform >>_e2e_expect_verification
166+
- << matrix.platform >>_e2e_subs
167+
# - << matrix.platform >>_build
168168
# filters:
169-
# branches:
170-
# only:
171-
# - /rel\/.*/
169+
# branches:
170+
# only:
171+
# - /rel\/.*/
172172
context:
173173
- slack-secrets
174174
- aws-secrets
@@ -442,28 +442,9 @@ commands:
442442
- run:
443443
name: Upload binaries << parameters.platform >>
444444
command: |
445-
# WORKING VERSION OF FLAGS
446-
# set -e
447-
# set -x
448-
# export PATH=$(echo "$PATH" | sed -e "s|:${HOME}/\.go_workspace/bin||g" | sed -e 's|:/usr/local/go/bin||g')
449-
# export GOPATH="<< parameters.build_dir >>/go"
450-
# export PATH="${PATH}:${GOPATH}/bin"
451-
# export ALGORAND_DEADLOCK=enable
452-
# GOLANG_VERSION=$(./scripts/get_golang_version.sh)
453-
# export GIMME_INSTALL_DIR=<< parameters.build_dir >>
454-
# export GIMME_ENV_PREFIX=<< parameters.build_dir >>/.gimme/envs
455-
# export GIMME_VERSION_PREFIX=<< parameters.build_dir >>/.gimme/versions
456-
# eval "$(<< parameters.build_dir >>/gimme "${GOLANG_VERSION}")"
457-
# scripts/configure_dev.sh
458-
# export RELEASE_GENESIS_PROCESS=true
459-
# export NO_BUILD=true
460-
# export SkipCleanCheck=1
461-
# scripts/deploy_version.sh "${CIRCLE_BRANCH}" "$(./scripts/osarchtype.sh)"
462-
463-
# EXPERIMENTAL VERSION OF FLAGS
464445
export PATH=$(echo "$PATH" | sed -e "s|:${HOME}/\.go_workspace/bin||g" | sed -e 's|:/usr/local/go/bin||g')
465446
export GOPATH="<< parameters.build_dir >>/go"
466-
export ALGORAND_DEADLOCK=enable
447+
# export ALGORAND_DEADLOCK=enable
467448
export GIMME_INSTALL_DIR=<< parameters.build_dir >>
468449
export GIMME_ENV_PREFIX=<< parameters.build_dir >>/.gimme/envs
469450
export GIMME_VERSION_PREFIX=<< parameters.build_dir >>/.gimme/versions

0 commit comments

Comments
 (0)