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

Local formula #859

Closed
wants to merge 25 commits into from
Closed

Local formula #859

wants to merge 25 commits into from
+159 −5

Conversation

@paulrouget
Copy link
Contributor

paulrouget commented Jul 17, 2018 •
edited by larsbergstrom

This change is Reviewable
@paulrouget paulrouget force-pushed the paulrouget:local_formula branch from 790ff4d to 7c5d9b9 Jul 17, 2018
@paulrouget
use local saltstack formula
Loading status checks…
d323068
@paulrouget paulrouget force-pushed the paulrouget:local_formula branch from 7c5d9b9 to d323068 Jul 17, 2018
@SimonSapin
Copy link
Member

SimonSapin commented Jul 17, 2018

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

bors-servo commented Jul 17, 2018

📌 Commit d323068 has been approved by SimonSapin
@bors-servo
Copy link
Contributor

bors-servo commented Jul 17, 2018

⌛ Testing commit d323068 with merge c739900...
bors-servo added a commit that referenced this pull request Jul 17, 2018
@bors-servo
Auto merge of #859 - paulrouget:local_formula, r=SimonSapin
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
c739900 
Local formula

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/859)
<!-- Reviewable:end -->
@paulrouget paulrouget mentioned this pull request Jul 17, 2018
Merged
@bors-servo
Copy link
Contributor

bors-servo commented Jul 17, 2018

💔 Test failed - status-travis
@KiChjang
Copy link
Member

KiChjang commented Jul 17, 2018

@bors-servo retry
@bors-servo
Copy link
Contributor

bors-servo commented Jul 17, 2018

⌛ Testing commit d323068 with merge 6244ad2...
bors-servo added a commit that referenced this pull request Jul 17, 2018
@bors-servo
Auto merge of #859 - paulrouget:local_formula, r=SimonSapin
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
6244ad2 
Local formula

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

bors-servo commented Jul 17, 2018

💔 Test failed - status-travis
@paulrouget paulrouget mentioned this pull request Jul 18, 2018
Closed
@jdm
Try removing hack about installed pip versions.
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
b1c052d
jdm added 3 commits Jul 18, 2018
@jdm
Reload modules after installing pip.
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
e137808
@jdm
Try downgrading xcode image.
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
84bf909
@jdm
Remove mac-specific homebrew changes
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
cfecf0f
jdm added 20 commits Jul 18, 2018
@jdm
Fix syntax error
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
ce3f2e5
@jdm
Try removing python before installing anything
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
7ffe516
@jdm
Force python uninstallation
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
64c26d3
@jdm
Set explicit path for python.
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
763e549
@jdm
Try forcing pip installation on macOS.
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
ae756ee
@jdm
Try installing python2 outside of salt
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
0fe3c61
@jdm
Update homebrew before installing
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
14756a8
@jdm
Try upgrading pip
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
7c59200
@jdm
Try making homebrew formula depend on python2
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
1b97f74
@jdm
Try upgrading then removing python
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
53725f1
@jdm
Fix syntax error
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
88e847f
@jdm
Try including salt python in path
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
e20e36a
@jdm
Ignore existing virtualenv installations on mac.
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
82ec884
@jdm
upgrade openssl
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
4913272
@jdm
upgrade more ssl
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
cc72071
@jdm
Don't depend on python@2 from salt formula
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
70f2da1
@jdm
Don't install python@2 directly
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
965c913
@jdm
don't remove python?
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
3ef835c
@jdm
Use pip before upgrading
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
f6c006e
@jdm
Install python2 and show off pip
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
f08d85c
@bors-servo
Copy link
Contributor

bors-servo commented Jul 25, 2018

☔ The latest upstream changes (presumably #863) made this pull request unmergeable. Please resolve the merge conflicts.
@paulrouget
Copy link
Contributor Author

paulrouget commented Jul 26, 2018

@jdm is this still needed?
@jdm
Copy link
Member

jdm commented Jul 26, 2018

It should not be necessary.
@jdm jdm closed this Jul 26, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@SimonSapin SimonSapin

Labels
S-awaiting-review S-needs-rebase
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
@paulrouget @SimonSapin @bors-servo @KiChjang @jdm @highfive
You can’t perform that action at this time.