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.

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

Fix CI workflow merge issues #442

Merged
merged 3 commits into from
Jun 1, 2018
Merged

Conversation

delner
Copy link
Contributor

@delner delner commented Jun 1, 2018

Reconciling the changes on master for CircleCI 2.0 with 0.13-dev changes was pretty complicated. This merge commit had a great number of changes, to which I had to add additional bugfixes to, in order to address some problems. This included:

There are still some outstanding issues breaking the build on 0.13-dev, and this pull request seeks to resolve those, including:

@delner delner self-assigned this Jun 1, 2018
@delner delner added bug Involves a bug dev/tooling Involves tools (e.g. Rubocop, CodeCov) dev/testing Involves testing processes (e.g. RSpec) labels Jun 1, 2018
@delner delner force-pushed the ci/fix_workflow_merge_issues branch from ace93d9 to a5be6b9 Compare June 1, 2018 20:41
@delner delner merged commit d061f98 into 0.13-dev Jun 1, 2018
@delner delner deleted the ci/fix_workflow_merge_issues branch June 1, 2018 21:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Involves a bug dev/testing Involves testing processes (e.g. RSpec) dev/tooling Involves tools (e.g. Rubocop, CodeCov)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant