aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authoralexandreFre <51956137+alexandreFre@users.noreply.github.com>2019-07-08 17:19:03 +0200
committerGitHub <noreply@github.com>2019-07-08 17:19:03 +0200
commit1b47892a9bef231b3e54c40345ae23a4b3b701e0 (patch)
tree174caa614a87fcad0b6f87200ee1fd0a90286b2a
parent5b5f8460537ecb489a9f544727513fc9b2d7d532 (diff)
parent1547d54fbe648764c6a94a0084ca7126c8811668 (diff)
downloadterraform-provider-mailgun-1b47892a9bef231b3e54c40345ae23a4b3b701e0.tar.gz
terraform-provider-mailgun-1b47892a9bef231b3e54c40345ae23a4b3b701e0.tar.zst
terraform-provider-mailgun-1b47892a9bef231b3e54c40345ae23a4b3b701e0.zip
Merge pull request #13 from fretlink/add_github_pages
Add GitHub pages
-rw-r--r--.travis.yml13
-rw-r--r--GNUmakefile5
-rw-r--r--README.md4
-rw-r--r--index.html1
-rwxr-xr-xscripts/launch-website.sh13
5 files changed, 34 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index a20fc58..f6ca131 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,18 @@ script:
19- make vet 19- make vet
20- make website-test 20- make website-test
21- make shellcheck 21- make shellcheck
22- make website-githubpages
22 23
24deploy:
25 provider: pages
26 skip_cleanup: true
27 github_token: "$GITHUB_TOKEN"
28 target_branch: gh-pages
29 keep_history: true
30 local_dir: terraform-provider-website
31 on:
32 branch: master
33
23matrix: 34matrix:
24 fast_finish: true 35 fast_finish: true
25 allow_failures: 36 allow_failures:
@@ -34,4 +45,4 @@ env:
34 matrix: 45 matrix:
35 - GO111MODULE=on 46 - GO111MODULE=on
36 global: 47 global:
37 - secure: rWjnWJgGEk2ncl6TXnpahUmriGSEaHGy+ZfmKKGpvrZxnlNY6sy63+qrnJNwaiV6uRG+kPfEChYD+dYfhjZRb3JWivo/ILCM9E0M9Ike6YAAsJKrcl0rUwFgqhBVXRdpBCSieYGiY8xNH/4Wu6i4bD9F1vSmpkvxYwae+7vGvyhEhyGMqWU92Svlus//K0Y27Qvlcw+Mx35nhdZsaeKN1Tb7uCHed9+vpCHud9NpSJLqxBjQl+1ibJ0Fqefyqbqy5dO0X3xE70eUMwM70ew+sgwzyq45VDBRPtVAN+8mtLOp2BVZE7SXFydfqnAm+1cbgzYBE5t+HlXwZzpRrtSwj+NRUt+7UtlrdfhMRmUVW76qWyMbF8CY6i06a73XWMYffKg3Ux2h0AHimvPJl8y+luMYmrl0RdgyLDcR0t9La0PNhOrKsauzkNX7KGPZwjTWv3+2RrsXDdT0Pi3JL15myyEuxiSAdDLIyiFB0sz9mCzYiu02SKKyURfo3bhMUrrBRbF47CpLTiCJrNBI36rk/cO4QJXyd9axEhy7vXiQObvaWZKbBqMTsL9EOZijJt5I1UxjwbCGM/GyYSrDK/+7d7PF0bvjo+8ps/o2WIW5B63IZiadzIt6nUOlEpFoOUsn0x4mufzIzMd+CSXdTxdXqRIXHxf5pKAUQZ8u7uRwERY= 48 secure: 2ophiVBTzEGwgWWeUBxeddU9QL+llyDNS1rT1fzKg4jwWOJumzd2bQL00UoYabpDTUUEASFJwJKxoBKCRKiOYHQl5RiH8f3K5ZftSnqR8MDT8NABL9pEPq6+M+kADs2hMMDGvV9qWNnwapcon7s09NiqLlZG88dRcW2kHeDlLBfSCZq9ghH/30XstYxD0zY2BGvFCBngKsnvMPZjGYUxTTX6IVuzgyv0BEN43dzY3gCY9tbsCUwAXaHxR1+/rE1Lq1I9H9RtsjUjrhqKAJ3DlaoIezUQqbmKoo3TkIC4YhF1Z0n+m5BmYaoGD5YHZJl8Susj0PGtQtbfRIUksIOhDPnNXzeycojwku7ErvahFT2rZ3SGkYuQpeN0+tqmPRTuZPHSxqw0XETUC3vu5AfpVIzAIa5hT2C9tBUHcNJYHeJb0teJ4mmY1J6rkh1l40bW2bE+tS9V9dvsVmfs6JthQBRo/zPDQqEUXHvb9FD6m1KbuxlZGDnnst0YFsrBDRu0bRJdXBLFnBo6oyAkrk2XzGzNas8NzCKuAIcxT/J7D9vyKiKTs+Fy3dRUohBiZqkZ5u8kQ0ncGqeIUnvMuc6GJBkNMaPhX2XjdQi9QUN2dCHimb1D5ox/7XwOYqc7nW3kbQxfRs/Us1ftrFvhpm/HKeD7QriUCkxwGdrrhfMTRdM=
diff --git a/GNUmakefile b/GNUmakefile
index 7750632..c88972d 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -46,6 +46,9 @@ test-compile:
46 fi 46 fi
47 go test -c $(TEST) $(TESTARGS) 47 go test -c $(TEST) $(TESTARGS)
48 48
49website-githubpages:
50 bash scripts/launch-website.sh
51
49website: 52website:
50ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO))) 53ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO)))
51 echo "$(WEBSITE_REPO) not found in your GOPATH (necessary for layouts and assets), get-ting..." 54 echo "$(WEBSITE_REPO) not found in your GOPATH (necessary for layouts and assets), get-ting..."
@@ -60,5 +63,5 @@ ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO)))
60endif 63endif
61 @$(MAKE) -C $(GOPATH)/src/$(WEBSITE_REPO) website-provider-test PROVIDER_PATH=$(shell pwd) PROVIDER_NAME=$(PKG_NAME) 64 @$(MAKE) -C $(GOPATH)/src/$(WEBSITE_REPO) website-provider-test PROVIDER_PATH=$(shell pwd) PROVIDER_NAME=$(PKG_NAME)
62 65
63.PHONY: build test testacc vet fmt fmtcheck errcheck test-compile website website-test 66.PHONY: build test testacc vet fmt fmtcheck errcheck test-compile website website-test website-githubpages
64 67
diff --git a/README.md b/README.md
index 1bd1668..e0ad112 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,10 @@ Terraform Provider Mailgun
7 7
8<img src="https://cdn.rawgit.com/hashicorp/terraform-website/master/content/source/assets/images/logo-hashicorp.svg" width="600px"> 8<img src="https://cdn.rawgit.com/hashicorp/terraform-website/master/content/source/assets/images/logo-hashicorp.svg" width="600px">
9 9
10Website for the doc
11---------------------
12https://fretlink.github.io/terraform-provider-mailgun/docs/providers/mailgun/index.html
13
10Requirements 14Requirements
11------------ 15------------
12 16
diff --git a/index.html b/index.html
new file mode 100644
index 0000000..550c3e9
--- /dev/null
+++ b/index.html
@@ -0,0 +1 @@
<meta http-equiv="refresh" content="0; url=docs/providers/mailgun/index.html" />
diff --git a/scripts/launch-website.sh b/scripts/launch-website.sh
new file mode 100755
index 0000000..dda894d
--- /dev/null
+++ b/scripts/launch-website.sh
@@ -0,0 +1,13 @@
1#!/usr/bin/env bash
2
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;
5wget --recursive --no-parent --domains localhost --page-requisites --html-extension --convert-links --no-clobber http://localhost:4567/docs/providers/mailgun/;
6
7rm -rf terraform-provider-website;
8mv localhost:4567/ terraform-provider-website;
9mv index.html terraform-provider-website/index.html
10
11docker stop "$(docker ps -q)") &
12
13make website