Skip to content

/ saltfs

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

use bash to run the mach stuff #322

Merged
merged 1 commit into from Apr 16, 2016
Merged

use bash to run the mach stuff #322

merged 1 commit into from Apr 16, 2016

Conversation

@larsbergstrom
Copy link
Contributor

larsbergstrom commented Apr 16, 2016

r? @aneeshusa @edunham

Ugh, I forgot that we need to execute bash.exe in order to run the mach command successfully. See:
https://github.com/servo/servo/blob/master/appveyor.yml#L45

This change is Reviewable
@larsbergstrom
Copy link
Contributor Author

larsbergstrom commented Apr 16, 2016

(no rush on this one; I'm about to crash for the night)
buildbot/master/files/config/master.cfg Outdated
@@ -238,8 +238,8 @@ windows_compile_env = dict({'PATH': r'C:\msys64\mingw64\bin;C:\msys64\usr\bin\C:
**common_test_env)

windows_factory = create_servo_factory([
steps.Compile(command=["./mach", "build", "-d", "-v"], env=windows_compile_env),
steps.Compile(command=["./mach", "test-unit"], env=windows_compile_env),
steps.Compile(command=["bash", "-lc", "./mach build -d -v"], env=windows_compile_env),

This comment has been minimized.

Sign in to view
@aneeshusa

aneeshusa Apr 16, 2016

Member

Style nit: I'd prefer for -l and -c to be separate.
@larsbergstrom
use bash to run the mach stuff
Loading status checks…
bf73b7d
@larsbergstrom larsbergstrom force-pushed the larsbergstrom:windows2 branch from 277988c to bf73b7d Apr 16, 2016
@larsbergstrom
Copy link
Contributor Author

larsbergstrom commented Apr 16, 2016

Updated :-)
@aneeshusa
Copy link
Member

aneeshusa commented Apr 16, 2016

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Apr 16, 2016

📌 Commit bf73b7d has been approved by aneeshusa
@bors-servo
Copy link
Contributor

bors-servo commented Apr 16, 2016

⌛ Testing commit bf73b7d with merge dfd714e...
bors-servo added a commit that referenced this pull request Apr 16, 2016
@bors-servo
Auto merge of #322 - larsbergstrom:windows2, r=aneeshusa
Loading status checks…
dfd714e 
use bash to run the mach stuff

r? @aneeshusa @edunham

Ugh, I forgot that we need to execute bash.exe in order to run the mach command successfully. See:
https://github.com/servo/servo/blob/master/appveyor.yml#L45

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/322)
<!-- Reviewable:end -->
@aneeshusa
Copy link
Member

aneeshusa commented Apr 16, 2016

@larsbergstrom For this deploy I think I'm going to kill Buildbot entirely and restart it via Upstart so it's running under the servo user again, but on the next one we should try out the SIGHUP (via kill -HUP).
@larsbergstrom
Copy link
Contributor Author

larsbergstrom commented Apr 16, 2016

@aneeshusa Sounds good to me!
@larsbergstrom
Copy link
Contributor Author

larsbergstrom commented Apr 16, 2016

Though, I think it'll be 1.5-2 hours before we plow through the current homu queue. I tried to restart all of the stuff that had broken from the MacOS issue, so there's a bit of a backlog right now.
@bors-servo
Copy link
Contributor

bors-servo commented Apr 16, 2016

☀️ Test successful - travis
@bors-servo bors-servo merged commit bf73b7d into servo:master Apr 16, 2016
1 of 2 checks passed
1 of 2 checks passed
continuous-integration/travis-ci/pr The Travis CI build failed
Details
homu Test successful
Details
@aneeshusa
Copy link
Member

aneeshusa commented Apr 17, 2016

The queue finally drained and I deployed this. After killing the service, service buildbot-master start didn't work - Buildbot died almost instantly with a termination status of 1 in the syslog. I used the buildbot restart --clean --nodaemon /home/servo/buildbot/master & command to get Buildbot back up for now, but it looks like something may be wrong with the Upstart file?

Another possibility might be something wonky going on with PID files. I rather dislike PID files. (They don't properly track service status.)

I've like to restart the entire servo-master1 machine at some point to see if Upstart brings up Buildbot successfully on its own to dig into this.
@aneeshusa
Copy link
Member

aneeshusa commented Apr 17, 2016

Also, I killed the buildbot process on servo-macpro1 to stop it from spamming the Buildbot master twistd.log file.
@larsbergstrom
Copy link
Contributor Author

larsbergstrom commented Apr 17, 2016

Thanks, both of those are great! I tried using unload on servo-macpro1, but the service ended up getting restarted :-/
@aneeshusa
Copy link
Member

aneeshusa commented Apr 17, 2016

I just deleted the plist files, so it shouldn't come back anytime soon.
@aneeshusa
Copy link
Member

aneeshusa commented Apr 17, 2016

FYI, this PR didn't work; Buildbot can't find 'bash' and fails with

'bash' is not recognized as an internal or external command,
operable program or batch file.
@aneeshusa aneeshusa mentioned this pull request Nov 16, 2016
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
@larsbergstrom @aneeshusa @bors-servo
You can’t perform that action at this time.