Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re-merge master into alphanet #4101

Merged
merged 10 commits into from
Jun 8, 2022
+1,347 −681
Merged

Re-merge master into alphanet #4101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4e968a2
pingpong: improve transaction scheduling (#3478)
tolikzinovyev Jun 1, 2022
9adda1d
removing-pingpong-deprecated-flag-rest (#4070)
algojack Jun 3, 2022
5e6c918
Fix another flakiness in TestReproducibleCatchpointLabels. (#4074)
tolikzinovyev Jun 4, 2022
febeb1e
PKI: Enable full usage of REST API to install participation keys (#4002)
AlgoStephenAkiki Jun 6, 2022
5838f72
Bug Fix: Adds validity round check for failing tests (#4085)
AlgoStephenAkiki Jun 7, 2022
f1036d5
CICD: Optimizing CircleCI cache usage (#4087)
algojack Jun 8, 2022
f0c60b3
DevOps: Define recipe for Alpha Net. (#4066)
egieseke Jun 8, 2022
08dcebc
AVM: Version downgrade check ported to master (#4093)
gmalouf Jun 8, 2022
b53a6da
AVM: Set proper costs for json_ref (#4096)
jannotti Jun 8, 2022
78bcaa8
Merge branch 'master' into feature/alphanet
onetechnical Jun 8, 2022
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
22 changes: 11 additions & 11 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,10 +217,12 @@ commands:
- restore_libsodium
- restore_cache:
keys:
- 'go-mod-1-14-7-v2-{{ arch }}-{{ checksum "go.mod" }}-{{ checksum "go.sum" }}'
- 'go-mod-1.17.9-v3-{{ arch }}-{{ checksum "go.mod" }}-{{ checksum "go.sum" }}'
- restore_cache:
keys:
- 'go-cache-v2-{{ .Environment.CIRCLE_STAGE }}-'
- 'go-cache-v3-{{ arch }}-{{ .Branch }}-{{ .Revision }}'
- 'go-cache-v3-{{ arch }}-{{ .Branch }}-'
- 'go-cache-v3-{{ arch }}-'
- run:
name: scripts/travis/build.sh --make_debug
command: |
Expand All @@ -233,11 +235,11 @@ commands:
scripts/travis/build.sh --make_debug
- cache_libsodium
- save_cache:
key: 'go-mod-1-14-7-v2-{{ arch }}-{{ checksum "go.mod" }}-{{ checksum "go.sum" }}'
key: 'go-mod-1.17.9-v3-{{ arch }}-{{ checksum "go.mod" }}-{{ checksum "go.sum" }}'
paths:
- << parameters.build_dir >>/go/pkg/mod
- save_cache:
key: 'go-cache-v2-{{ .Environment.CIRCLE_STAGE }}-{{ .Environment.CIRCLE_BUILD_NUM }}'
key: 'go-cache-v3-{{ arch }}-{{ .Branch }}-{{ .Revision }}'
paths:
- tmp/go-cache
- persist_to_workspace:
Expand All @@ -257,7 +259,7 @@ commands:
mkdir -p tmp
find crypto/libsodium-fork -type f -exec openssl md5 "{}" + > tmp/libsodium.md5
- save_cache:
key: 'libsodium-fork-v2-{{ .Environment.CIRCLE_STAGE }}-{{ checksum "tmp/libsodium.md5" }}'
key: 'libsodium-fork-v2-{{ arch }}-{{ checksum "tmp/libsodium.md5" }}'
paths:
- crypto/libs

Expand All @@ -271,7 +273,7 @@ commands:
find crypto/libsodium-fork -type f -exec openssl md5 "{}" + > tmp/libsodium.md5
- restore_cache:
keys:
- 'libsodium-fork-v2-{{ .Environment.CIRCLE_STAGE }}-{{ checksum "tmp/libsodium.md5" }}'
- 'libsodium-fork-v2-{{ arch }}-{{ checksum "tmp/libsodium.md5" }}'

generic_test:
description: Run build tests from build workspace, for re-use by diferent architectures
Expand Down Expand Up @@ -301,7 +303,9 @@ commands:
touch << parameters.result_path >>/<< parameters.result_subdir >>/${CIRCLE_NODE_INDEX}/testresults.json
- restore_cache:
keys:
- 'go-cache-v2-{{ .Environment.CIRCLE_STAGE }}-'
- 'go-cache-v3-{{ arch }}-{{ .Branch }}-{{ .Revision }}'
- 'go-cache-v3-{{ arch }}-{{ .Branch }}-'
- 'go-cache-v3-{{ arch }}-'
- run:
name: Run build tests
no_output_timeout: << parameters.no_output_timeout >>
Expand Down Expand Up @@ -333,10 +337,6 @@ commands:
root: << parameters.result_path >>
paths:
- << parameters.result_subdir >>
- save_cache:
key: 'go-cache-v2-{{ .Environment.CIRCLE_STAGE }}-{{ .Environment.CIRCLE_BUILD_NUM }}'
paths:
- tmp/go-cache

upload_coverage:
description: Collect coverage reports and upload them
Expand Down
Loading