Skip to content

ci: update mac ci setup#750

Merged
junr03 merged 2 commits intomasterfrom
fix-mac
Mar 13, 2020
Merged

ci: update mac ci setup#750
junr03 merged 2 commits intomasterfrom
fix-mac

Conversation

@junr03
Copy link
Copy Markdown
Member

@junr03 junr03 commented Mar 13, 2020

Description: move mac ci setup to use envoy's script. I don't see much of a point in keeping a separate script here. For instance, envoyproxy/envoy#10357 updated to fix bazel after CI images broke. Instead of keeping up-to-date we can piggy back on efforts in upstream Envoy. Obviously, if diverging needs evolve we might need a second script in Envoy Mobile that calls the Envoy script, and does additional work.
Risk Level: low, CI will let us know if I screwed up.
Testing: CI

Signed-off-by: Jose Nino jnino@lyft.com

Jose Nino added 2 commits March 13, 2020 13:53
Signed-off-by: Jose Nino <jnino@lyft.com>
Signed-off-by: Jose Nino <jnino@lyft.com>
rebello95
rebello95 previously approved these changes Mar 13, 2020
Copy link
Copy Markdown
Contributor

@rebello95 rebello95 left a comment

Choose a reason for hiding this comment

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

If CI is green

done

# https://github.com/Microsoft/azure-pipelines-image-generation/blob/master/images/macos/macos-10.14-Readme.md#xcode
sudo xcode-select --switch /Applications/Xcode_11.3.app
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actually this will probably break CI

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

the 10.15 machines have 11.3.1 and I updated .bazelrc

@rebello95 rebello95 dismissed their stale review March 13, 2020 21:01

Question

@rebello95
Copy link
Copy Markdown
Contributor

Is the submodule update deliberate?

@junr03
Copy link
Copy Markdown
Member Author

junr03 commented Mar 13, 2020

Yep, because we need envoyproxy/envoy#10357

@junr03 junr03 merged commit 030c45f into master Mar 13, 2020
@junr03 junr03 deleted the fix-mac branch March 13, 2020 21:43
junr03 added a commit that referenced this pull request Mar 18, 2020
Description: After #750 I moved the deps install to use the script in Envoy. This means that the CI checkout needs to be recursive. The only path not updated was the cocoapods artifact. This PR fixes it.

Signed-off-by: Jose Nino <jnino@lyft.com>
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