From eb15b10bd08dc3337d34ec77203c0256d1ef940c Mon Sep 17 00:00:00 2001 From: Jack Smith Date: Tue, 9 Aug 2022 16:12:47 -0500 Subject: [PATCH 1/8] rolling back to xcode 13.2.1 = macos 11 --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5cfc869fc6..4cc77ab293 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -38,13 +38,13 @@ executors: resource_class: arm.large mac_amd64_medium: macos: - xcode: 13.4.1 + xcode: 13.2.1 resource_class: medium environment: HOMEBREW_NO_AUTO_UPDATE: "true" mac_amd64_large: macos: - xcode: 13.4.1 + xcode: 13.2.1 resource_class: large environment: HOMEBREW_NO_AUTO_UPDATE: "true" From fb7276da779c1537c7438ec5b7366e0495235308 Mon Sep 17 00:00:00 2001 From: Jack Smith Date: Tue, 9 Aug 2022 16:20:23 -0500 Subject: [PATCH 2/8] Commenting out other jobs for testing --- .circleci/config.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4cc77ab293..b7f8c9517c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -64,13 +64,13 @@ workflows: version: 2 "circleci_build_and_test": jobs: - - codegen_verification + # - codegen_verification - build: name: << matrix.platform >>_build matrix: &matrix-default parameters: - platform: ["amd64", "arm64", "mac_amd64"] + platform: ["mac_amd64"] # TESTONLY["amd64", "arm64", "mac_amd64"] filters: &filters-default branches: ignore: @@ -188,7 +188,7 @@ workflows: - slack-secrets - aws-secrets - #- windows_x64_build + # - windows_x64_build commands: prepare_go: @@ -674,7 +674,7 @@ jobs: - run: no_output_timeout: 45m command: | - #export PATH=$(echo "$PATH" | sed -e 's|:/home/circleci/\.go_workspace/bin||g' | sed -e 's|:/usr/local/go/bin||g') + # export PATH=$(echo "$PATH" | sed -e 's|:/home/circleci/\.go_workspace/bin||g' | sed -e 's|:/usr/local/go/bin||g') export GOPATH="/home/circleci/go" export ALGORAND_DEADLOCK=enable export SKIP_GO_INSTALLATION=True @@ -689,9 +689,9 @@ jobs: resource_class: small working_directory: << pipeline.parameters.build_dir >>/project parameters: - platform: # platform: ["amd64", "arm64", "mac_amd64"] + platform: type: string - job_type: # job_type: ["test", "test_nightly", "integration", "integration_nightly", "e2e_expect", "e2e_expect_nightly"] + job_type: type: string steps: - checkout @@ -704,9 +704,9 @@ jobs: resource_class: small working_directory: << pipeline.parameters.build_dir >>/project parameters: - platform: # platform: ["amd64", "arm64", "mac_amd64"] + platform: type: string - job_type: # job_type: ["test", "test_nightly", "integration", "integration_nightly", "e2e_expect", "e2e_expect_nightly"] + job_type: type: string steps: - checkout From 58348c1ce695a2a34d6a88d738d3a068aebc0f25 Mon Sep 17 00:00:00 2001 From: Jack Smith Date: Tue, 9 Aug 2022 16:22:18 -0500 Subject: [PATCH 3/8] Commenting out other jobs for testing --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b7f8c9517c..73446155c4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -155,7 +155,7 @@ workflows: name: << matrix.platform >>_<< matrix.job_type >>_verification matrix: parameters: - platform: ["amd64", "arm64", "mac_amd64"] + platform: ["mac_amd64"] # TESTONLY ["amd64", "arm64", "mac_amd64"] job_type: ["test", "integration", "e2e_expect"] requires: - << matrix.platform >>_<< matrix.job_type >> From c4cbc7d7b037425644d317c3fe39cda7f4af38d6 Mon Sep 17 00:00:00 2001 From: Jack Smith Date: Tue, 9 Aug 2022 16:23:58 -0500 Subject: [PATCH 4/8] Commenting out other jobs for testing --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 73446155c4..fe1a848212 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -179,7 +179,7 @@ workflows: - << matrix.platform >>_integration_nightly_verification - << matrix.platform >>_e2e_expect_nightly_verification - << matrix.platform >>_e2e_subs_nightly - - codegen_verification + # - codegen_verification filters: branches: only: From e0d55066155fa7e36c4c5360d8026bb58716d1ac Mon Sep 17 00:00:00 2001 From: Jack Smith Date: Thu, 11 Aug 2022 14:09:53 -0500 Subject: [PATCH 5/8] Testing new self hosted m1 runner --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fe1a848212..4e71ae2e72 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -50,7 +50,7 @@ executors: HOMEBREW_NO_AUTO_UPDATE: "true" mac_arm64: &executor-mac-arm64 machine: true - resource_class: algorand/macstadium-m1 + resource_class: algorand/macstadium-m1-macos11 environment: HOMEBREW_NO_AUTO_UPDATE: "true" # these are required b/c jobs explicitly assign sizes to the executors @@ -70,7 +70,7 @@ workflows: name: << matrix.platform >>_build matrix: &matrix-default parameters: - platform: ["mac_amd64"] # TESTONLY["amd64", "arm64", "mac_amd64"] + platform: ["mac_arm64"] # TESTONLY["amd64", "arm64", "mac_amd64"] filters: &filters-default branches: ignore: @@ -155,7 +155,7 @@ workflows: name: << matrix.platform >>_<< matrix.job_type >>_verification matrix: parameters: - platform: ["mac_amd64"] # TESTONLY ["amd64", "arm64", "mac_amd64"] + platform: ["mac_arm64"] # TESTONLY ["amd64", "arm64", "mac_amd64"] job_type: ["test", "integration", "e2e_expect"] requires: - << matrix.platform >>_<< matrix.job_type >> From 1da74e43f4a11d2195887c6df54242f0e9f255bf Mon Sep 17 00:00:00 2001 From: Jack Smith Date: Thu, 11 Aug 2022 15:58:06 -0500 Subject: [PATCH 6/8] Resetting cache to new version 4 --- .circleci/config.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5cfc869fc6..fa65f9a2bf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -238,12 +238,12 @@ commands: - restore_libsodium - restore_cache: keys: - - 'go-mod-1.17.9-v3-{{ arch }}-{{ checksum "go.mod" }}-{{ checksum "go.sum" }}' + - 'go-mod-1.17.9-v4-{{ arch }}-{{ checksum "go.mod" }}-{{ checksum "go.sum" }}' - restore_cache: keys: - - 'go-cache-v3-{{ arch }}-{{ .Branch }}-{{ .Revision }}' - - 'go-cache-v3-{{ arch }}-{{ .Branch }}-' - - 'go-cache-v3-{{ arch }}-' + - 'go-cache-v4-{{ arch }}-{{ .Branch }}-{{ .Revision }}' + - 'go-cache-v4-{{ arch }}-{{ .Branch }}-' + - 'go-cache-v4-{{ arch }}-' - run: name: scripts/travis/build.sh --make_debug command: | @@ -256,11 +256,11 @@ commands: scripts/travis/build.sh --make_debug - cache_libsodium - save_cache: - key: 'go-mod-1.17.9-v3-{{ arch }}-{{ checksum "go.mod" }}-{{ checksum "go.sum" }}' + key: 'go-mod-1.17.9-v4-{{ arch }}-{{ checksum "go.mod" }}-{{ checksum "go.sum" }}' paths: - << parameters.build_dir >>/go/pkg/mod - save_cache: - key: 'go-cache-v3-{{ arch }}-{{ .Branch }}-{{ .Revision }}' + key: 'go-cache-v4-{{ arch }}-{{ .Branch }}-{{ .Revision }}' paths: - tmp/go-cache - persist_to_workspace: @@ -280,7 +280,7 @@ commands: mkdir -p tmp find crypto/libsodium-fork -type f -exec openssl md5 "{}" + > tmp/libsodium.md5 - save_cache: - key: 'libsodium-fork-v2-{{ arch }}-{{ checksum "tmp/libsodium.md5" }}' + key: 'libsodium-fork-v4-{{ arch }}-{{ checksum "tmp/libsodium.md5" }}' paths: - crypto/libs @@ -294,7 +294,7 @@ commands: find crypto/libsodium-fork -type f -exec openssl md5 "{}" + > tmp/libsodium.md5 - restore_cache: keys: - - 'libsodium-fork-v2-{{ arch }}-{{ checksum "tmp/libsodium.md5" }}' + - 'libsodium-fork-v4-{{ arch }}-{{ checksum "tmp/libsodium.md5" }}' generic_test: description: Run build tests from build workspace, for re-use by diferent architectures @@ -324,9 +324,9 @@ commands: touch << parameters.result_path >>/<< parameters.result_subdir >>/${CIRCLE_NODE_INDEX}/testresults.json - restore_cache: keys: - - 'go-cache-v3-{{ arch }}-{{ .Branch }}-{{ .Revision }}' - - 'go-cache-v3-{{ arch }}-{{ .Branch }}-' - - 'go-cache-v3-{{ arch }}-' + - 'go-cache-v4-{{ arch }}-{{ .Branch }}-{{ .Revision }}' + - 'go-cache-v4-{{ arch }}-{{ .Branch }}-' + - 'go-cache-v4-{{ arch }}-' - run: name: Run build tests no_output_timeout: << parameters.no_output_timeout >> From 76da8e02fad3e67e0bf83aa02ac18c9e50f48426 Mon Sep 17 00:00:00 2001 From: Jack Smith Date: Fri, 19 Aug 2022 09:31:18 -0500 Subject: [PATCH 7/8] moving to nightly changes --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ba29c98cdf..136e211f95 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -70,7 +70,7 @@ workflows: name: << matrix.platform >>_build matrix: &matrix-default parameters: - platform: ["mac_arm64"] # TESTONLY["amd64", "arm64", "mac_amd64"] + platform: ["amd64", "arm64", "mac_amd64"] filters: &filters-default branches: ignore: @@ -155,7 +155,7 @@ workflows: name: << matrix.platform >>_<< matrix.job_type >>_verification matrix: parameters: - platform: ["mac_arm64"] # TESTONLY ["amd64", "arm64", "mac_amd64"] + platform: ["amd64", "arm64", "mac_amd64"] job_type: ["test", "integration", "e2e_expect"] requires: - << matrix.platform >>_<< matrix.job_type >> @@ -179,7 +179,7 @@ workflows: - << matrix.platform >>_integration_nightly_verification - << matrix.platform >>_e2e_expect_nightly_verification - << matrix.platform >>_e2e_subs_nightly - # - codegen_verification + - codegen_verification filters: branches: only: @@ -188,7 +188,7 @@ workflows: - slack-secrets - aws-secrets - # - windows_x64_build + #- windows_x64_build commands: prepare_go: From bc194be71105be4e7ec83948ae42ce8d904ff6ab Mon Sep 17 00:00:00 2001 From: Jack Smith Date: Fri, 19 Aug 2022 09:40:33 -0500 Subject: [PATCH 8/8] removed codegen --- .circleci/config.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cb37a6d340..97897fb0d5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -64,8 +64,6 @@ workflows: version: 2 "circleci_build_and_test": jobs: - - codegen_verification - - build: name: << matrix.platform >>_build matrix: &matrix-default