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

Clean up Homu cfg.toml Jinja usage #605

Merged
merged 4 commits into from May 17, 2017
Merged

Clean up Homu cfg.toml Jinja usage #605

merged 4 commits into from May 17, 2017
+101 −175

Conversation

@aneeshusa
Copy link
Member

aneeshusa commented Feb 15, 2017 •
edited by larsbergstrom

Finally got around to #536 (comment), plus a few extras.

This should yield no change in the deployed Homu cfg.toml; that is, check the servo-master1 Travis build running with SALT_FROM_SCRATCH=false to ensure that the state for cfg.toml reports no changes on the second run.

This change is Reviewable
@zploskey
Copy link

zploskey commented Feb 17, 2017

Review status: 0 of 2 files reviewed at latest revision, 2 unresolved discussions, some commit checks failed.

homu/files/cfg.toml, line 40 at r3 (raw file):

    "ipc-channel": {
        "extra_reviewers": [ "antrik" ],
    }

Missing comma results in servo-master1 build failures: https://travis-ci.org/servo/saltfs/jobs/201974142 and https://travis-ci.org/servo/saltfs/jobs/201974142.

homu/files/cfg.toml, line 49 at r3 (raw file):

    "rust-bindgen": {
        "extra_reviewers": [ "fitzgen" ],
    }

Also missing a comma.

Comments from Reviewable
@aneeshusa aneeshusa force-pushed the aneeshusa:clean-up-homu-cfg branch 2 times, most recently from 854e766 to 062fb13 Feb 18, 2017
@bors-servo
Copy link
Contributor

bors-servo commented Mar 2, 2017

☔ The latest upstream changes (presumably #610) made this pull request unmergeable. Please resolve the merge conflicts.
@aneeshusa
Use a dict instead of a list for `travis_repos`
5cafe32 
This is much less verbose and easier to read,
and also calls out repos with special configurations more clearly.
@aneeshusa aneeshusa force-pushed the aneeshusa:clean-up-homu-cfg branch from 062fb13 to 56314d4 May 17, 2017
aneeshusa added 3 commits Feb 15, 2017
@aneeshusa
Pass only relevant secrets into Homu cfg.toml
de91d2e 
This is slightly more concise and scopes the easily available secrets.
Also switch to single quotes for better syntax highlighting.
@aneeshusa
Make builders lists multiline to fit in line limit
38e656a 
This makes the line easier to read and creates cleaner diffs.
@aneeshusa
Scope nical's review privileges to euclid and webrender
Loading status checks…
953c7c9
@aneeshusa aneeshusa force-pushed the aneeshusa:clean-up-homu-cfg branch from 56314d4 to 953c7c9 May 17, 2017
@aneeshusa aneeshusa mentioned this pull request May 17, 2017
Merged
@jdm
Copy link
Member

jdm commented May 17, 2017

@bors-servo: r+
Thanks for doing this!
@bors-servo
Copy link
Contributor

bors-servo commented May 17, 2017

📌 Commit 953c7c9 has been approved by jdm
@bors-servo
Copy link
Contributor

bors-servo commented May 17, 2017

⌛ Testing commit 953c7c9 with merge e8302d3...
bors-servo added a commit that referenced this pull request May 17, 2017
@bors-servo
Auto merge of #605 - aneeshusa:clean-up-homu-cfg, r=jdm
Loading status checks…
e8302d3 
Clean up Homu cfg.toml Jinja usage

Finally got around to #536 (comment), plus a few extras.

This should yield no change in the deployed Homu `cfg.toml`; that is, check the `servo-master1` Travis build running with `SALT_FROM_SCRATCH=false` to ensure that the state for `cfg.toml` reports no changes on the second run.

<!-- 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/605)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented May 17, 2017

☀️ Test successful - status-travis
Approved by: jdm
Pushing e8302d3 to master...
@bors-servo bors-servo merged commit 953c7c9 into servo:master May 17, 2017
2 of 3 checks passed
2 of 3 checks passed
code-review/reviewable 2 files, 2 discussions left (aneeshusa, zploskey)
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@bors-servo bors-servo mentioned this pull request May 17, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jdm jdm

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@aneeshusa @zploskey @bors-servo @jdm @highfive
You can’t perform that action at this time.