Skip to content

Merge in two fixes from 6.0.x #3587

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.

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

Merged
merged 4 commits into from
Oct 22, 2020
Merged

Merge in two fixes from 6.0.x #3587

merged 4 commits into from
Oct 22, 2020

Conversation

tannewt
Copy link
Member

@tannewt tannewt commented Oct 21, 2020

No description provided.

tannewt and others added 4 commits October 19, 2020 17:41
They must have the PORT_ prefix otherwise they mask the wrong pins.

Fixes #3552
Recently, the macos-10.15 image was updated with a non-brew version of awscli.  This made our CI script, which does a `brew install awscli` fail:
```
Error: The `brew link` step did not complete successfully
The formula built, but is not symlinked into /usr/local
Could not symlink bin/aws
Target /usr/local/bin/aws
already exists. You may want to remove it:
  rm '/usr/local/bin/aws'
```
build.yml: Fix building mpy-cross-mac
@tannewt tannewt requested a review from jepler October 21, 2020 19:54
Copy link

@jepler jepler left a comment

Choose a reason for hiding this comment

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

CI failure was a network glitch

@jepler jepler merged commit fa4c4c2 into main Oct 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants