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

Jump to bottom

CICD: Macos11 support #4399

Merged
merged 12 commits into from
Aug 23, 2022
Merged

CICD: Macos11 support #4399

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
eb15b10
rolling back to xcode 13.2.1 = macos 11
algojack Aug 9, 2022
fb7276d
Commenting out other jobs for testing
algojack Aug 9, 2022
58348c1
Commenting out other jobs for testing
algojack Aug 9, 2022
c4cbc7d
Commenting out other jobs for testing
algojack Aug 9, 2022
e0d5506
Testing new self hosted m1 runner
algojack Aug 11, 2022
3402ddb
Merge pull request #4382 from algojack/support-for-macos11
algojack Aug 11, 2022
1da74e4
Resetting cache to new version 4
algojack Aug 11, 2022
89f9eaf
Merge branch 'macos11-support' of github.com:algorand/go-algorand int…
algojack Aug 11, 2022
76da8e0
moving to nightly changes
algojack Aug 19, 2022
c8b8cda
Merge branch 'master' into macos11-support
algojack Aug 19, 2022
bc194be
removed codegen
algojack Aug 19, 2022
cdbd2bd
Merge branch 'master' into macos11-support
algojack Aug 22, 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
32 changes: 16 additions & 16 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,19 @@ 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"
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
Expand Down Expand Up @@ -228,12 +228,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: |
Expand All @@ -246,11 +246,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

Expand All @@ -263,7 +263,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

Expand All @@ -277,7 +277,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
Expand Down Expand Up @@ -616,7 +616,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')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

because ide added a space

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if you are asking why the command is there, i don't know. I think we were trying to cut out homebrew path and golang path from path env var. But since it works without this for now, maybe it's not needed at all.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since we don't currently run that workflow (windows build) I can't say for sure, and don't want to remove it until we test if we need it or not.

export GOPATH="/home/circleci/go"
export ALGORAND_DEADLOCK=enable
export SKIP_GO_INSTALLATION=True
Expand All @@ -631,9 +631,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
Expand All @@ -646,9 +646,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
Expand Down