From a9116e7419cb97205b0b59b1d067a063ea7bafc3 Mon Sep 17 00:00:00 2001 From: hweeks Date: Sun, 10 Mar 2019 09:23:47 -0700 Subject: [PATCH 01/18] ci(docs): test simple build --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b161c7a58..6629905a4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,7 @@ jobs: steps: - checkout - run: | - pip install --user mkdocs mkdocs-material + pip install --upgrade pip git config --global user.email $GH_EMAIL git config --global user.name $GH_NAME mkdocs gh-deploy From 872fe93dd134c0a373264e3e75c5ab578494ec42 Mon Sep 17 00:00:00 2001 From: hweeks Date: Sun, 10 Mar 2019 09:24:12 -0700 Subject: [PATCH 02/18] ci(docs): make each pr build to test --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6629905a4..8b2f5ca3d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -19,5 +19,5 @@ workflows: - build: filters: branches: - only: master + only: /*/ From ffcc000bc36586eaf721fc836cc90cbc46a202ed Mon Sep 17 00:00:00 2001 From: hweeks Date: Sun, 10 Mar 2019 09:26:29 -0700 Subject: [PATCH 03/18] ci(docs): fix pattern --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8b2f5ca3d..ca087c04b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -19,5 +19,5 @@ workflows: - build: filters: branches: - only: /*/ + only: /.*/ From 831cf2c6205239a79a2b6bf15b1860abaf0a02e7 Mon Sep 17 00:00:00 2001 From: hweeks Date: Sun, 10 Mar 2019 09:27:28 -0700 Subject: [PATCH 04/18] ci(docs): fix pip perm --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ca087c04b..b04a0e205 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,6 @@ jobs: steps: - checkout - run: | - pip install --upgrade pip git config --global user.email $GH_EMAIL git config --global user.name $GH_NAME mkdocs gh-deploy From bf2362e157dcb3d1f2c2a316d4a51a108cda1272 Mon Sep 17 00:00:00 2001 From: hweeks Date: Sun, 10 Mar 2019 09:28:59 -0700 Subject: [PATCH 05/18] ci(docs): fix env variable --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b04a0e205..a79025d78 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ jobs: - checkout - run: | git config --global user.email $GH_EMAIL - git config --global user.name $GH_NAME + git config --global user.name $GH_USER mkdocs gh-deploy workflows: From 6b75d59516409fe6961969ae694814be94a8e6d7 Mon Sep 17 00:00:00 2001 From: hweeks Date: Sun, 10 Mar 2019 09:33:50 -0700 Subject: [PATCH 06/18] ci(docs): work out installation --- .circleci/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index a79025d78..7f257a204 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,6 +7,9 @@ jobs: steps: - checkout - run: | + pip install --user --upgrade pip + pip install --user mkdocs + pip install --user mkdocs-material git config --global user.email $GH_EMAIL git config --global user.name $GH_USER mkdocs gh-deploy From a1ed92ac41d1db9d0cd50a262f83887b790cf349 Mon Sep 17 00:00:00 2001 From: hweeks Date: Sun, 10 Mar 2019 09:36:35 -0700 Subject: [PATCH 07/18] ci(docs): docker build of docs --- .circleci/config.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7f257a204..ba2cf84c6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,14 +5,12 @@ jobs: - image: circleci/python:3.7.0 working_directory: ~/repo steps: + - setup_remote_docker - checkout - run: | - pip install --user --upgrade pip - pip install --user mkdocs - pip install --user mkdocs-material git config --global user.email $GH_EMAIL git config --global user.name $GH_USER - mkdocs gh-deploy + docker run --rm -it -v ~/.ssh:/root/.ssh -v ${PWD}:/docs squidfunk/mkdocs-material gh-deploy workflows: version: 2 From 3cb1e3e9bad112d72eabe643501fe88c84600ab9 Mon Sep 17 00:00:00 2001 From: hweeks Date: Sun, 10 Mar 2019 09:37:56 -0700 Subject: [PATCH 08/18] ci(docs): fixing path --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ba2cf84c6..3c781dbcf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,7 @@ jobs: - run: | git config --global user.email $GH_EMAIL git config --global user.name $GH_USER - docker run --rm -it -v ~/.ssh:/root/.ssh -v ${PWD}:/docs squidfunk/mkdocs-material gh-deploy + docker run --rm -it -v ~/.ssh:/root/.ssh -v ~/repo:/docs squidfunk/mkdocs-material gh-deploy workflows: version: 2 From fdd9c8335ba4d987ab91712258df394e3e24df74 Mon Sep 17 00:00:00 2001 From: hweeks Date: Sun, 10 Mar 2019 09:39:15 -0700 Subject: [PATCH 09/18] ci(docs): testing file info --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3c781dbcf..7684c4738 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,6 +10,7 @@ jobs: - run: | git config --global user.email $GH_EMAIL git config --global user.name $GH_USER + ls ~/repo docker run --rm -it -v ~/.ssh:/root/.ssh -v ~/repo:/docs squidfunk/mkdocs-material gh-deploy workflows: From 09838f08ae1e786c99091a00755e9579f1c86fa3 Mon Sep 17 00:00:00 2001 From: hweeks Date: Sun, 10 Mar 2019 09:43:37 -0700 Subject: [PATCH 10/18] ci(docs): testing directory location --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7684c4738..336279a50 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,6 +11,8 @@ jobs: git config --global user.email $GH_EMAIL git config --global user.name $GH_USER ls ~/repo + cwd + pwd docker run --rm -it -v ~/.ssh:/root/.ssh -v ~/repo:/docs squidfunk/mkdocs-material gh-deploy workflows: From feae2426c6c2cc9b86708f33474971a01039e73e Mon Sep 17 00:00:00 2001 From: hweeks Date: Sun, 10 Mar 2019 09:44:45 -0700 Subject: [PATCH 11/18] ci(docs): testing directory location --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 336279a50..04a156bb9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,7 +11,6 @@ jobs: git config --global user.email $GH_EMAIL git config --global user.name $GH_USER ls ~/repo - cwd pwd docker run --rm -it -v ~/.ssh:/root/.ssh -v ~/repo:/docs squidfunk/mkdocs-material gh-deploy From e4fba8773dac98e0cd0d368fc80d171fcee0ae69 Mon Sep 17 00:00:00 2001 From: hweeks Date: Sun, 10 Mar 2019 09:46:15 -0700 Subject: [PATCH 12/18] ci(docs): updating directory location --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 04a156bb9..aaf0b8358 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ jobs: git config --global user.name $GH_USER ls ~/repo pwd - docker run --rm -it -v ~/.ssh:/root/.ssh -v ~/repo:/docs squidfunk/mkdocs-material gh-deploy + docker run --rm -it -v ~/.ssh:/root/.ssh -v /home/circleci/repo:/docs squidfunk/mkdocs-material gh-deploy workflows: version: 2 From a466a8637b4c0c3e7ddb2f81028f643e4b9177d3 Mon Sep 17 00:00:00 2001 From: hweeks Date: Sun, 10 Mar 2019 09:50:16 -0700 Subject: [PATCH 13/18] ci(docs): updating executor type --- .circleci/config.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index aaf0b8358..d18e47214 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,17 +1,16 @@ version: 2 jobs: build: + machine: true docker: - image: circleci/python:3.7.0 working_directory: ~/repo steps: - - setup_remote_docker - checkout - run: | git config --global user.email $GH_EMAIL git config --global user.name $GH_USER - ls ~/repo - pwd + ls docker run --rm -it -v ~/.ssh:/root/.ssh -v /home/circleci/repo:/docs squidfunk/mkdocs-material gh-deploy workflows: From 51ea44d4730658554217feb0d19466a25e15dc50 Mon Sep 17 00:00:00 2001 From: hweeks Date: Sun, 10 Mar 2019 09:51:00 -0700 Subject: [PATCH 14/18] ci(docs): updating executor type and config --- .circleci/config.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d18e47214..399889e01 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,8 +2,6 @@ version: 2 jobs: build: machine: true - docker: - - image: circleci/python:3.7.0 working_directory: ~/repo steps: - checkout From 675ab0678fa9b1768d1f10370aa25edc7404e759 Mon Sep 17 00:00:00 2001 From: hweeks Date: Sun, 10 Mar 2019 09:56:53 -0700 Subject: [PATCH 15/18] ci(docs): retrying on dedicated machine --- .circleci/config.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 399889e01..00dd519d6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,8 +8,10 @@ jobs: - run: | git config --global user.email $GH_EMAIL git config --global user.name $GH_USER - ls - docker run --rm -it -v ~/.ssh:/root/.ssh -v /home/circleci/repo:/docs squidfunk/mkdocs-material gh-deploy + git remote add gh-token "https://${GH_TOKEN}@github.com/dynamoosejs/dynamoose.git" + git fetch gh-token && git fetch gh-token gh-pages:gh-pages + pip install mkdocs mkdocs-material + mkdocs gh-deploy -v --clean --remote-name gh-token workflows: version: 2 From a4d8a06b2dc904d35b4a6dab4640fad9d6591126 Mon Sep 17 00:00:00 2001 From: hweeks Date: Sun, 10 Mar 2019 10:05:03 -0700 Subject: [PATCH 16/18] ci(docs): style issue --- docs/stylesheets/override.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/stylesheets/override.css b/docs/stylesheets/override.css index a48dd56a2..b1edc437e 100644 --- a/docs/stylesheets/override.css +++ b/docs/stylesheets/override.css @@ -1,5 +1,5 @@ .runkit-frame { - width: calc(122rem - 40rem); + width: calc(122rem - 80rem); position: relative; max-width: 120vw; left: 100%; From 723ed1a4c4682b15d916817b1519245827442b9c Mon Sep 17 00:00:00 2001 From: hweeks Date: Sun, 10 Mar 2019 10:07:01 -0700 Subject: [PATCH 17/18] ci(docs): fix name --- mkdocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkdocs.yml b/mkdocs.yml index cd3e685e7..0d9833d10 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -1,4 +1,4 @@ -site_name: Dynamooses +site_name: Dynamoose repo_name: dynamoosejs/dynamoose repo_url: https://github.com/dynamoosejs/dynamoose extra_css: From 288c87515f9aa6dcad77e66c1c4cd154883f55d2 Mon Sep 17 00:00:00 2001 From: hweeks Date: Sun, 10 Mar 2019 10:07:30 -0700 Subject: [PATCH 18/18] ci(docs): fix deploy branch --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 00dd519d6..6ea4fbc08 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,5 +20,5 @@ workflows: - build: filters: branches: - only: /.*/ + only: master