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

Support deploying extra files using an EXTRA_FILES variable #68

Merged
merged 1 commit into from
Aug 29, 2017

Conversation

foolip
Copy link
Member

@foolip foolip commented Aug 28, 2017

Part of whatwg/meta#11.

Copy link
Member

@domenic domenic left a comment

Choose a reason for hiding this comment

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

Awesome. LGTM with one fixup. Let's note that this helps with whatwg/meta#11 .

@@ -63,6 +63,12 @@ echo ""

rm -rf "$WEB_ROOT" || exit 0

copy_extra_files() {
if [[ "$EXTRA_FILES" != "" ]]; then
cp $EXTRA_FILES $1
Copy link
Member

Choose a reason for hiding this comment

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

It appears we're not running shellcheck on this script. (It does not like the grep regexp also.)

Per https://github.com/koalaman/shellcheck/wiki/SC2086, it suggests we quote at least the $1. It also wants us to quote the $EXTRA_FILES, but that defeats the point; I've asked about what the right pattern is at https://stackoverflow.com/q/45931553/3191 .

In the meantime, let's just quote $1 at least.

Copy link
Member Author

Choose a reason for hiding this comment

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

Ah, thanks, wonder what the answer will be :)

Copy link
Member Author

Choose a reason for hiding this comment

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

Also adding a link to the question in the source.

@domenic
Copy link
Member

domenic commented Aug 29, 2017

Also not sure what the plan is for https://github.com/whatwg/url/blob/master/.htaccess which should only be deployed to master, not the snapshots.

@foolip
Copy link
Member Author

foolip commented Aug 29, 2017

I didn't notice .htaccess was only for master, but happily .htaccess will be to move that out of the repo entirely to misc-server's configs, so this won't be a problem.

@foolip foolip force-pushed the deploy-extra-files branch from 7feb000 to 3c1ba65 Compare August 29, 2017 08:07
@@ -25,6 +25,7 @@ NEW_SERVER_PUBLIC_KEY="ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIb
TRAVIS=${TRAVIS:-false}
TRAVIS_PULL_REQUEST=${TRAVIS_PULL_REQUEST:-false}
DEPLOY_USER=${DEPLOY_USER:-}
EXTRA_FILES=${EXTRA_FILES:-}
Copy link
Member Author

Choose a reason for hiding this comment

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

Added this after local testing revealed an error: "EXTRA_FILES: unbound variable"

With that fix, it works locally, so merging this.

@foolip foolip force-pushed the deploy-extra-files branch from 3c1ba65 to 9b576c4 Compare August 29, 2017 08:11
@foolip foolip merged commit db38e83 into master Aug 29, 2017
@foolip foolip deleted the deploy-extra-files branch August 29, 2017 08:12
foolip added a commit to whatwg/compat that referenced this pull request Aug 29, 2017
Depends on whatwg/whatwg.org#68.

The generic deploy.sh already runs the HTML checker, so those bits can
be removed from .travis.yml too.
foolip added a commit to whatwg/compat that referenced this pull request Aug 29, 2017
Depends on whatwg/whatwg.org#68.

The generic deploy.sh already runs the HTML checker, so those bits can
be removed from .travis.yml too.
foolip added a commit to whatwg/compat that referenced this pull request Aug 30, 2017
foolip added a commit to whatwg/compat that referenced this pull request Aug 30, 2017
Depends on whatwg/whatwg.org#68.

The generic deploy.sh already runs the HTML checker, so those bits can
be removed from .travis.yml too.
annevk pushed a commit to whatwg/compat that referenced this pull request Aug 30, 2017
Depends on whatwg/whatwg.org#68.

The generic deploy.sh already runs the HTML checker, so those bits can
be removed from .travis.yml too.
foolip added a commit that referenced this pull request Sep 3, 2017
foolip added a commit that referenced this pull request Sep 4, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants