Skip to content

build: update bazel, upstream envoy, & ios rules#958

Merged
rebello95 merged 11 commits intomainfrom
rules-apple
Jul 22, 2020
Merged

build: update bazel, upstream envoy, & ios rules#958
rebello95 merged 11 commits intomainfrom
rules-apple

Conversation

@rebello95
Copy link
Contributor

@rebello95 rebello95 commented Jul 15, 2020 •
edited
Loading

Signed-off-by: Michael Rebello me@michaelrebello.com

@rebello95
build: update rules_apple
ed9df69 
Signed-off-by: Michael Rebello <me@michaelrebello.com>
buildbreaker
buildbreaker previously approved these changes Jul 15, 2020
View reviewed changes
buildbreaker
buildbreaker reviewed Jul 15, 2020
View reviewed changes
bazel/swift_static_framework.bzl Outdated
Comment on lines +139 to +140
_allowlist_function_transition = attr.label(
default = "@build_bazel_rules_apple//tools/allowlists/function_transition_allowlist",
Copy link

@buildbreaker buildbreaker Jul 15, 2020

Choose a reason for hiding this comment

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

did bazel change these?

Copy link
Contributor Author

@rebello95 rebello95 Jul 15, 2020

Choose a reason for hiding this comment

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

Yea bazelbuild/rules_apple@c283c82

Copy link

@buildbreaker buildbreaker Jul 16, 2020

Choose a reason for hiding this comment

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

🙌

@rebello95
newer
de660fa 
Signed-off-by: Michael Rebello <me@michaelrebello.com>
rebello95 added 2 commits July 15, 2020 17:16
@rebello95
rules_swift
50394b0 
Signed-off-by: Michael Rebello <me@michaelrebello.com>
@rebello95
bump bazel
26f3054 
Signed-off-by: Michael Rebello <me@michaelrebello.com>
@rebello95
Copy link
Contributor Author

rebello95 commented Jul 16, 2020

Need Bazel 3.4.1: envoyproxy/envoy#12123

@rebello95 rebello95 changed the title build: update rules_apple build: update bazel & ios rules Jul 16, 2020
@rebello95 rebello95 added the work in progress Not yet ready for review label Jul 16, 2020
rebello95 added 2 commits July 20, 2020 09:49
@rebello95
Merge remote-tracking branch 'origin/main' into rules-apple
f358cda 
Signed-off-by: Michael Rebello <me@michaelrebello.com>
@rebello95
bump envoy
c6f2bcc 
Signed-off-by: Michael Rebello <me@michaelrebello.com>
@rebello95 rebello95 marked this pull request as ready for review July 20, 2020 16:51
keith
keith reviewed Jul 21, 2020
View reviewed changes
@rebello95 @keith
Update bazel/swift_static_framework.bzl
2dddeba 
Signed-off-by: Michael Rebello <me@michaelrebello.com>

Co-authored-by: Keith Smiley <keithbsmiley@gmail.com>
keith
keith previously approved these changes Jul 21, 2020
View reviewed changes
@rebello95
fixup
78b14c7 
Signed-off-by: Michael Rebello <me@michaelrebello.com>
rebello95 added 2 commits July 21, 2020 11:01
@rebello95
reformat
05b31ce 
Signed-off-by: Michael Rebello <me@michaelrebello.com>
@rebello95
fixup
d85eac7 
Signed-off-by: Michael Rebello <me@michaelrebello.com>
@rebello95 rebello95 changed the title build: update bazel & ios rules build: update bazel, upstream envoy, & ios rules Jul 21, 2020
@rebello95 rebello95 requested review from buildbreaker and keith July 21, 2020 18:43
keith
keith previously approved these changes Jul 21, 2020
View reviewed changes
goaway
goaway previously approved these changes Jul 21, 2020
View reviewed changes
Copy link
Contributor

@goaway goaway left a comment

Choose a reason for hiding this comment

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

Nice, looks good.

@buildbreaker
Copy link

buildbreaker commented Jul 21, 2020

rerunning failed ci

@rebello95
Copy link
Contributor Author

rebello95 commented Jul 21, 2020

Looks like this is a legit failure when building the ObjC app:

Execution platform: @local_config_platform//:host
examples/objective-c/hello_world/ViewController.m:1:9: fatal error: 'Envoy/Envoy-Swift.h' file not found
#import <Envoy/Envoy-Swift.h>
        ^~~~~~~~~~~~~~~~~~~~~
1 error generated.
Target //examples/objective-c/hello_world:app failed to build

@keith do you happen to know of anything off the top of your head that may have broken our header setup with the rules updates?

@keith
Copy link
Member

keith commented Jul 21, 2020

does the framework this produces have one at all after this change?

@rebello95
Copy link
Contributor Author

rebello95 commented Jul 21, 2020

Yep, it's present in dist/Envoy.framework/Headers/Envoy-Swift.h. Looks fine to me too 🤔

@keith
Copy link
Member

keith commented Jul 22, 2020

how about the module map?

@rebello95
magic from keith
2f47a68 
Signed-off-by: Michael Rebello <me@michaelrebello.com>
@rebello95 rebello95 dismissed stale reviews from goaway and keith via 2f47a68 July 22, 2020 00:47
@rebello95
Copy link
Contributor Author

rebello95 commented Jul 22, 2020

Resolved with magic from @keith, more context: bazelbuild/bazel#10674 (comment)

@rebello95 rebello95 requested a review from keith July 22, 2020 00:56
@rebello95 rebello95 removed the work in progress Not yet ready for review label Jul 22, 2020
@rebello95 rebello95 merged commit c6e1af6 into main Jul 22, 2020
@rebello95 rebello95 deleted the rules-apple branch July 22, 2020 17:38
goaway added a commit that referenced this pull request Jul 30, 2020
@goaway
Revert "build: update bazel, upstream envoy, & ios rules (#958)"
44387b4 
This reverts commit c6e1af6.
goaway added a commit that referenced this pull request Jul 30, 2020
@goaway
Revert "build: update bazel, upstream envoy, & ios rules (#958)"
29a3d7f 
This reverts commit c6e1af6.

Signed-off-by: Mike Schore <mike.schore@gmail.com>
@goaway goaway mentioned this pull request Jul 30, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@goaway goaway goaway left review comments

@buildbreaker buildbreaker Awaiting requested review from buildbreaker

+1 more reviewer

@keith keith keith approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@rebello95 @buildbreaker @keith @goaway