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

windows_task with Gemfile.lock change #5997

Closed
wants to merge 11 commits into from
Closed

windows_task with Gemfile.lock change #5997

wants to merge 11 commits into from

Conversation

btm
Copy link
Contributor

@btm btm commented Apr 3, 2017

This is #5886 after resetting the Gemfile.lock and running rake dependencies:update and bundle install --no-deployment. /cc @NimishaS

nimisha added 10 commits April 3, 2017 13:06
Signed-off-by: nimisha <nimisha.sharad@msystechnologies.com>
Signed-off-by: nimisha <nimisha.sharad@msystechnologies.com>
…operty

Signed-off-by: nimisha <nimisha.sharad@msystechnologies.com>
Signed-off-by: nimisha <nimisha.sharad@msystechnologies.com>
Signed-off-by: nimisha <nimisha.sharad@msystechnologies.com>
Signed-off-by: nimisha <nimisha.sharad@msystechnologies.com>
Signed-off-by: nimisha <nimisha.sharad@msystechnologies.com>
Signed-off-by: nimisha <nimisha.sharad@msystechnologies.com>
Signed-off-by: nimisha <nimisha.sharad@msystechnologies.com>
Signed-off-by: nimisha <nimisha.sharad@msystechnologies.com>
Signed-off-by: Bryan McLellan <btm@chef.io>
@btm btm requested review from mwrock, tas50 and smurawski April 3, 2017 17:26
@@ -1,2 +1,3 @@
---
BUNDLE_FROZEN: "1"
BUNDLE_WITHOUT: "omnibus_package:test:pry:integration:docgen:maintenance:travis:aix:bsd:linux:mac_os_x:solaris:windows:development"
Copy link
Contributor

Choose a reason for hiding this comment

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

This shouldn't be merged here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, I kind of figured that but rake dependencies:update keeps adding it back.

Copy link
Contributor

Choose a reason for hiding this comment

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

rake dependencies:update_gemfile_lock

but you'll still pull in ohai which will break amazon linux -- working on that.

end

def load_task_xml(task_name)
xml_cmd = shell_out("chcp 65001 >nul 2>&1 && schtasks /Query /TN \"#{task_name}\" /XML")
Copy link
Contributor

Choose a reason for hiding this comment

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

#5886 (comment)
I also made PR to upstream chef-boneyard/windows#461

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@jugatsu, I asked @NimishaS and they said that they had swapped in powershell_out in one place (line 207) but this place would take more changes to the code than just swapping. They're going to look at it again, but we also want to make sure this gets merged this week for Chef 13.

Copy link

Choose a reason for hiding this comment

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

@btm , fixed the review comment. Turned out that I only had to remove stdout.force_encoding('UTF-8') from powershell_out("#{task_script}").stdout.force_encoding('UTF-8') to make it working in the later case.

@btm
Copy link
Contributor Author

btm commented Apr 4, 2017

@NimishaS is pulling the Gemfile.lock change into #5886.

@btm btm closed this Apr 4, 2017
@btm btm deleted the btm/windows_task branch April 4, 2017 13:36
@chef chef locked and limited conversation to collaborators Nov 16, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants