From 2e1c6ec22901291d458bb035ed340f5a9651c356 Mon Sep 17 00:00:00 2001
From: Christopher Farrenden <christopher.farrenden@q-ctrl.com>
Date: Fri, 8 May 2020 12:41:17 +1000
Subject: [PATCH] Use new tagging workflow

---
 .github/workflows/on-push.yml    | 22 ++--------------------
 .github/workflows/on-release.yml |  1 -
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/on-push.yml b/.github/workflows/on-push.yml
index 17974796..0e177052 100644
--- a/.github/workflows/on-push.yml
+++ b/.github/workflows/on-push.yml
@@ -35,7 +35,7 @@ jobs:
         ./ci docker run qctrl/python-build:3.7 poetry run black -- --check .
     - name: Run Pylint
       run: |
-        ./ci docker run qctrl/python-build:3.7 poetry run pylint_runner  
+        ./ci docker run qctrl/python-build:3.7 poetry run pylint_runner
 
   pytest:
     runs-on: ubuntu-latest
@@ -66,7 +66,6 @@ jobs:
         ./ci docker run qctrl/python-build:3.7 /scripts/publish-dev-version.sh
 
   sphinx_documentation:
-    if: github.ref == 'refs/heads/master'
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -80,9 +79,9 @@ jobs:
           -f ./docs/Dockerfile \
           -u $(cat .hub_user) \
           -p $(cat .hub_pass) \
-          -t development \
           --suffix -docs
     - name: Update Sphinx deployment in Kubernetes (Development)
+      if: github.ref == 'refs/heads/master'
       run: |
         ./ci vault login -r ${{ secrets.VAULT_ROLE_ID }} -s ${{ secrets.VAULT_SECRET_ID }}
         ./ci vault gcpKey -t $(cat .token) --proj q-ctrl-documentation -r docs -o ./gcloud-service-key.json
@@ -90,20 +89,3 @@ jobs:
         gcloud config set project q-ctrl-documentation
         gcloud container clusters get-credentials docs-development --zone us-central1-c
         kubectl -n docs-dev rollout restart deployment/python-open-controls-docs
-
-  sphinx_documentation_test:
-    if: github.ref != 'refs/heads/master'
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build Sphinx Image and Push to DockerHub
-      run: |
-        source <(curl -sL http://ci.q-ctrl.com)
-        ./ci vault login -r ${{ secrets.VAULT_ROLE_ID }} -s ${{ secrets.VAULT_SECRET_ID }}
-        ./ci vault get -t $(cat .token) -p secret/data/dockerhub -k hub_user -o .hub_user
-        ./ci vault get -t $(cat .token) -p secret/data/dockerhub -k hub_pass -o .hub_pass
-        ./ci docker buildPush \
-          -f ./docs/Dockerfile \
-          -u $(cat .hub_user) \
-          -p $(cat .hub_pass) \
-          --suffix -docs
diff --git a/.github/workflows/on-release.yml b/.github/workflows/on-release.yml
index afc142bc..ef23b54c 100644
--- a/.github/workflows/on-release.yml
+++ b/.github/workflows/on-release.yml
@@ -41,7 +41,6 @@ jobs:
             -f ./docs/Dockerfile \
             -u $(cat .hub_user) \
             -p $(cat .hub_pass) \
-            -t latest \
             --suffix -docs
       - name: Update Sphinx deployment in Kubernetes (Production)
         run: |