diff options
author | Alexandre Garand <alexandre.garand@fretlink.com> | 2019-07-08 17:19:22 +0200 |
---|---|---|
committer | Alexandre Garand <alexandre.garand@fretlink.com> | 2019-07-08 17:19:22 +0200 |
commit | 96cd61e152de23fd789a0739dd63f48b333a0be0 (patch) | |
tree | 7b4129bb77b3cd77662f52be5b2c3c93fdf8206a | |
parent | 70ac6365eecfb6a88f56a46b9b7d685e6726e43c (diff) | |
parent | 1b47892a9bef231b3e54c40345ae23a4b3b701e0 (diff) | |
download | terraform-provider-mailgun-96cd61e152de23fd789a0739dd63f48b333a0be0.tar.gz terraform-provider-mailgun-96cd61e152de23fd789a0739dd63f48b333a0be0.tar.zst terraform-provider-mailgun-96cd61e152de23fd789a0739dd63f48b333a0be0.zip |
Merge branch 'master' of github.com:fretlink/terraform-provider-mailgun into add_import_test
-rw-r--r-- | .travis.yml | 2 | ||||
-rwxr-xr-x | scripts/launch-website.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index c43c63a..f6ca131 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -29,7 +29,7 @@ deploy: | |||
29 | keep_history: true | 29 | keep_history: true |
30 | local_dir: terraform-provider-website | 30 | local_dir: terraform-provider-website |
31 | on: | 31 | on: |
32 | all_branches: true | 32 | branch: master |
33 | 33 | ||
34 | matrix: | 34 | matrix: |
35 | fast_finish: true | 35 | fast_finish: true |
diff --git a/scripts/launch-website.sh b/scripts/launch-website.sh index ec9e92c..dda894d 100755 --- a/scripts/launch-website.sh +++ b/scripts/launch-website.sh | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/env bash | 1 | #!/usr/bin/env bash |
2 | 2 | ||
3 | #the sleep and the subquery & are here to ensure that wget is called after make website have done its work so that the website is gotten correctly | 3 | # sleep and the sub-command are there to make sure wget is called *after* `make website` has started. This ensures the website to be fetched correctly. |
4 | (sleep 10; | 4 | (sleep 10; |
5 | wget --recursive --no-parent --domains localhost --page-requisites --html-extension --convert-links --no-clobber http://localhost:4567/docs/providers/mailgun/; | 5 | wget --recursive --no-parent --domains localhost --page-requisites --html-extension --convert-links --no-clobber http://localhost:4567/docs/providers/mailgun/; |
6 | 6 | ||