From b076d76f1938bf73ec0bdd9cea0b855c80d25f4b Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 22 Nov 2018 23:57:21 +0100 Subject: [PATCH 1/9] update mkdocs to resolve conflicts --- Makefile | 5 +++-- mkdocs.yml | 10 ++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index c099169..167b0e9 100644 --- a/Makefile +++ b/Makefile @@ -2,8 +2,9 @@ bucket?= distribution?= install: - pip install mkdocs mkdocs-material --upgrade --user - + pip install mkdocs==0.17.5 + pip install mkdocs-material==2.9.4 + build: ifdef CONTINUOUSPHP rm -rf .git diff --git a/mkdocs.yml b/mkdocs.yml index 3cc2d83..a58c4c7 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -9,7 +9,7 @@ theme: primary: 'indigo' accent: 'light green' # Copyright -copyright: 'Copyright © 2017 - 2018 Continuous SA' +copyright: 'Copyright © 2017 - 2019 Continuous SA' # Options extra: social: @@ -22,11 +22,13 @@ extra: # Extensions markdown_extensions: - admonition - - codehilite(guess_lang=false) - - toc(permalink=true) + - codehilite: + guess_lang: false + - toc: + permalink: true - meta # Navigation -pages: +nav: - INTRODUCTION: index.md - GIT REPOSITORY HOSTING SERVICES: - GIT REPOSITORY HOSTING SERVICES: vcs.md From 7264da644c4428bcf199657b072e4d4fc79f2269 Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 23 Nov 2018 00:04:54 +0100 Subject: [PATCH 2/9] update mkdocs to resolve conflicts --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 167b0e9..5655157 100644 --- a/Makefile +++ b/Makefile @@ -2,8 +2,8 @@ bucket?= distribution?= install: - pip install mkdocs==0.17.5 - pip install mkdocs-material==2.9.4 + pip install mkdocs==1.0.4 + pip install mkdocs-material==3.1.0 build: ifdef CONTINUOUSPHP From d356ea77a9af7118b4b9b87ef0b990b8eb436475 Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 23 Nov 2018 00:06:16 +0100 Subject: [PATCH 3/9] update mkdocs to resolve conflicts --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 5655157..003d8ae 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,7 @@ bucket?= distribution?= install: + pip install --upgrade pip pip install mkdocs==1.0.4 pip install mkdocs-material==3.1.0 From 93bae7862e1a0932f5753b55892aaab1ab38e1f5 Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 23 Nov 2018 00:10:25 +0100 Subject: [PATCH 4/9] add user perms --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 003d8ae..c3b6f2e 100644 --- a/Makefile +++ b/Makefile @@ -2,9 +2,9 @@ bucket?= distribution?= install: - pip install --upgrade pip - pip install mkdocs==1.0.4 - pip install mkdocs-material==3.1.0 + pip install --upgrade pip --user + pip install mkdocs==1.0.4 --user + pip install mkdocs-material==3.1.0 --user build: ifdef CONTINUOUSPHP From cb02606958545aea5b298945f4f65a903c942548 Mon Sep 17 00:00:00 2001 From: Matthieu Nogatchewsky Date: Fri, 5 Apr 2019 18:40:29 +0200 Subject: [PATCH 5/9] Updating Makefile --- Makefile | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index c3b6f2e..dd5fb34 100644 --- a/Makefile +++ b/Makefile @@ -2,14 +2,24 @@ bucket?= distribution?= install: - pip install --upgrade pip --user - pip install mkdocs==1.0.4 --user - pip install mkdocs-material==3.1.0 --user +ifdef CONTINUOUSPHP + sudo apt-get update -y + sudo apt-get install -y software-properties-common + sudo add-apt-repository ppa:jonathonf/python-3.6 + sudo apt-get update -y + sudo apt-get install -y python3 python3-pip python3.6 + sudo pip3 install virtualenv + virtualenv -p /usr/bin/python3.6 ~/virtualenvs/venv-devopspy + source ~/virtualenvs/venv-devopspy/bin/activate +endif + pip3 install mkdocs mkdocs-material build: ifdef CONTINUOUSPHP rm -rf .git endif + export LC_ALL=C.UTF-8 + export LANG=C.UTF-8 mkdocs build -d dist deploy: From af8452c857745f1e61b7ac54fdb14ed47eaf0ff3 Mon Sep 17 00:00:00 2001 From: Matthieu Nogatchewsky Date: Fri, 5 Apr 2019 18:48:23 +0200 Subject: [PATCH 6/9] Updating makefile --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index dd5fb34..d839d7f 100644 --- a/Makefile +++ b/Makefile @@ -12,8 +12,8 @@ ifdef CONTINUOUSPHP virtualenv -p /usr/bin/python3.6 ~/virtualenvs/venv-devopspy source ~/virtualenvs/venv-devopspy/bin/activate endif - pip3 install mkdocs mkdocs-material - + pip3 install mkdocs==1.0.4 mkdocs-material==3.0.1 + build: ifdef CONTINUOUSPHP rm -rf .git From 352ac5b2f538b40d322535d0cc36ea5a053bdbe8 Mon Sep 17 00:00:00 2001 From: Matthieu Nogatchewsky Date: Fri, 5 Apr 2019 18:56:47 +0200 Subject: [PATCH 7/9] Updating makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d839d7f..102e476 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ ifdef CONTINUOUSPHP virtualenv -p /usr/bin/python3.6 ~/virtualenvs/venv-devopspy source ~/virtualenvs/venv-devopspy/bin/activate endif - pip3 install mkdocs==1.0.4 mkdocs-material==3.0.1 + pip3 install mkdocs==1.0.4 mkdocs-material==3.1.0 build: ifdef CONTINUOUSPHP From 909e0e1db9ed41e81e7988ba673766ab0a659cbc Mon Sep 17 00:00:00 2001 From: Matthieu Nogatchewsky Date: Fri, 5 Apr 2019 18:59:54 +0200 Subject: [PATCH 8/9] Updating makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 102e476..9b38a8d 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ ifdef CONTINUOUSPHP virtualenv -p /usr/bin/python3.6 ~/virtualenvs/venv-devopspy source ~/virtualenvs/venv-devopspy/bin/activate endif - pip3 install mkdocs==1.0.4 mkdocs-material==3.1.0 + sudo pip3 install mkdocs==1.0.4 mkdocs-material==3.1.0 build: ifdef CONTINUOUSPHP From 00d3cc79a74de22000794bb476f10a73d0d5b44f Mon Sep 17 00:00:00 2001 From: Matthieu Nogatchewsky Date: Fri, 5 Apr 2019 22:03:06 +0200 Subject: [PATCH 9/9] Updating makefile --- Makefile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 9b38a8d..b59c4e0 100644 --- a/Makefile +++ b/Makefile @@ -4,13 +4,7 @@ distribution?= install: ifdef CONTINUOUSPHP sudo apt-get update -y - sudo apt-get install -y software-properties-common - sudo add-apt-repository ppa:jonathonf/python-3.6 - sudo apt-get update -y - sudo apt-get install -y python3 python3-pip python3.6 - sudo pip3 install virtualenv - virtualenv -p /usr/bin/python3.6 ~/virtualenvs/venv-devopspy - source ~/virtualenvs/venv-devopspy/bin/activate + sudo apt-get install -y python3 python3-pip endif sudo pip3 install mkdocs==1.0.4 mkdocs-material==3.1.0