Skip to content

Re-land fix docker build and deploy_gallery-macos #43654

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
Merged
christopherfujino merged 40 commits into from
Oct 29, 2019
Merged

Re-land fix docker build and deploy_gallery-macos #43654

christopherfujino merged 40 commits into from
Oct 29, 2019

Conversation

@christopherfujino
Copy link
Contributor

@christopherfujino christopherfujino commented Oct 28, 2019 •
edited
Loading

Description

This originally landed in #43362 and was reverted by #43557. The additional fix I added was changing a direct fastlane ... invocation in deploy_gallery.sh to bundle exec fastlane ... with the env var BUNDLE_GEMFILE set to the path to the Gemfile that was installed during the Cirrus setup step (I did the same on linux, pointing to the Gemfile the Dockerfile uses to install).

Tests

I temporarily edited the cirrus config to run the post-submit version of deploy_gallery-macos and it passed (the reverted it to only exercise archiving post-submit, as before).

Checklist

Before you create this PR confirm that it meets all requirements listed below by checking the relevant checkboxes ([x]). This will ensure a smooth and quick review process.

  • I read the [Contributor Guide] and followed the process outlined there for submitting PRs.
  • I signed the [CLA].
  • I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement].
  • I updated/added relevant documentation (doc comments with ///).
  • All existing and new tests are passing.
  • The analyzer (flutter analyze --flutter-repo) does not report any problems on my PR.
  • I am willing to follow-up on review comments in a timely manner.

Breaking Change

Does your PR require Flutter developers to manually update their apps to accommodate your change?

  • Yes, this is a breaking change (Please read [Handling breaking changes]). Replace this with a link to the e-mail where you asked for input on this proposed change.
  • No, this is not a breaking change.

@christopherfujino
pin ruby gems, get newer v1.13.3 golang
8ebcbdd
@christopherfujino
comment out everything but linux in cirrus.yml
50c2c66
@christopherfujino
use Dockerfile, not image
2dab488
@christopherfujino
add foo bar
76db0e8
@christopherfujino
change from mapping -> array
c25cf3e
@christopherfujino
add DOCKER_CONTEXT env var
a758db3
@christopherfujino
make DOCKER_CONTEXT relative to other vars
0b3fe7a
@christopherfujino
change dockerfile to be relative
9380bec
@christopherfujino
remove space
47b4bc5
@christopherfujino
wip change docker tag to fujino
00ea774
@christopherfujino
re-enable fastlane in test
e3eb292
@christopherfujino
enable mac deploy_gallery test
102a58c
@christopherfujino
explicitly install fastlane
b2dd0a0
@christopherfujino
remove all cirrus yml changes except addition of fastlane
d5220ee
@christopherfujino
wip disable only_if for docker_builder
a7cfd8b
@christopherfujino
remove dependencies for docker_builder
cb4f483
@christopherfujino
remove everything but docker_builder
80c4066
@christopherfujino
fix script -> build_script
111b4b3
@christopherfujino
cd
97f02a8
@christopherfujino
re-enable all tests, use dockerfile-as-ci
d7257ba
@christopherfujino
move CIRRUS_DOCKER_CONTEXT env var to global env
11f8af9
@christopherfujino
revert to using registered docker image
5d3fb91
@christopherfujino
re-enable dockerfile as ci
28dbdaf
@christopherfujino
add helpful comment
6ec5ec2
@christopherfujino
merge
eecf57a
@christopherfujino
update comments
ab3bcbc
@christopherfujino
remove unused coveralls gem
bd5216a
@christopherfujino
Utilize a Gemfile for adding ruby dependencies to cirrus mac tasks
e96e2be
@christopherfujino
add debugging
1612484
@christopherfujino
add Gemfile.lock for cirrus
3e17cd5
@fluttergithubbot fluttergithubbot added c: contributor-productivity Team-specific productivity, code health, technical debt. work in progress; do not review labels Oct 28, 2019
@christopherfujino christopherfujino marked this pull request as ready for review October 29, 2019 16:31
gspencergoog
gspencergoog approved these changes Oct 29, 2019
View reviewed changes
Copy link
Contributor

@gspencergoog gspencergoog left a comment

Choose a reason for hiding this comment

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

32384589-a60f0e74-c078-11e7-9bc1-e5b5287aea9d

dev/bots/deploy_gallery.sh Outdated
)
echo "iOS Flutter Gallery built"
if [[ -z "$CIRRUS_PR" ]]; then
#if [[ -z "$CIRRUS_PR" ]]; then
Copy link
Contributor

@gspencergoog gspencergoog Oct 29, 2019

Choose a reason for hiding this comment

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

Remove commented out code.

Copy link
Contributor Author

@christopherfujino christopherfujino Oct 29, 2019

Choose a reason for hiding this comment

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

Good catch, done.

mklim
mklim approved these changes Oct 29, 2019
View reviewed changes
Copy link
Contributor

@mklim mklim left a comment

Choose a reason for hiding this comment

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

LGTM

@christopherfujino christopherfujino merged commit 20af1f2 into flutter:master Oct 29, 2019
@christopherfujino christopherfujino deleted the fix-docker-build branch October 29, 2019 21:32
@christopherfujino christopherfujino mentioned this pull request Nov 1, 2019
Merged
9 tasks
This was referenced Nov 21, 2019
Closed
Closed
Inconnu08 pushed a commit to Inconnu08/flutter that referenced this pull request Nov 26, 2019
@christopherfujino @Inconnu08
Re-land fix docker build and deploy_gallery-macos (flutter#43654)
9ed749d
@christopherfujino christopherfujino mentioned this pull request Mar 13, 2020
Closed
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 3, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@gspencergoog gspencergoog gspencergoog approved these changes

+1 more reviewer

@mklim mklim mklim approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

c: contributor-productivity Team-specific productivity, code health, technical debt.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@christopherfujino @mklim @gspencergoog @googlebot @fluttergithubbot