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

feat(travis): autopublish with echidna (closes #24) #99

Merged
merged 1 commit into from
Sep 1, 2016

Conversation

marcoscaceres
Copy link
Member

Prevent TR from becoming more TRash.

@@ -2,7 +2,17 @@ language: generic

script: bash ./deploy.sh

branches:
only:
- gh-pages
Copy link
Member

@jyasskin jyasskin Jul 12, 2016

Choose a reason for hiding this comment

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

I think we want master in the only list also, or general PRs might not cause Travis to run deploy.sh to check that the files compile.

Copy link
Member

Choose a reason for hiding this comment

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

Maybe we can get away with only having master, since deploy.sh will push to gh-pages, which causes https://w3c.github.io/permissions/ to get the new document, and then echidna will pick it up from there.

Copy link
Member Author

Choose a reason for hiding this comment

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

I think we want master in the only list also, or general PRs might not cause Travis to run deploy.sh to check that the files compile.

Oh, I might be confused, but I thought we only wanted it on gh-pages to allow us to keep editing on master before deploying via gh-pages. I'll change it to master tho.

Copy link
Member

Choose a reason for hiding this comment

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

deploy.sh automatically compiles master to gh-pages, so we don't have this intermediate step in this repository.

@marcoscaceres
Copy link
Member Author

@jyasskin, made the changes you suggested. Let me know how you want to proceed.

- secure: SneznWMBm52ct+mFI6NAVrB8k/BjO/H/hjR1eB3tjPwF0vzpL5fnbD1mmlNmVJMTWMsSUfI917JotA+7lfwoWJuHwlq2WfzQ0ybfvtuqjo7LS22T5X8IFYmCyVNR5asbJha/LNhqUyGDsZlPBgbKK0hqTd8eWjjQTztnlSrorGM=

after_success:
- '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && curl "https://labs.w3.org/echidna/api/request" --data "url=$URL" --data "decision=$DECISION" --data "token=$TOKEN"'
Copy link
Member

Choose a reason for hiding this comment

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

We could use the condition from https://github.com/w3c/permissions/blob/master/deploy.sh#L8 ([ "$TRAVIS_PULL_REQUEST" != "false" -o "$TRAVIS_BRANCH" != "master" ]) to allow Travis to run on all branches, but only ping Echidna for master commits.

LGTM either way.

@jyasskin
Copy link
Member

Nobody objected to @annevk's suggestion to publish at https://lists.w3.org/Archives/Public/public-webappsec/2016Aug/0042.html, so I'm happy with this PR. Please merge when you're ready.

@marcoscaceres marcoscaceres merged commit 5b54054 into master Sep 1, 2016
@marcoscaceres marcoscaceres deleted the echidna branch September 1, 2016 07:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants