Skip to content

Commit 361b20f

Browse files
authored
Use new tagging workflow (#78)
1 parent d60a821 commit 361b20f

File tree

2 files changed

+2
-21
lines changed

2 files changed

+2
-21
lines changed

.github/workflows/on-push.yml

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
./ci docker run qctrl/python-build:3.7 poetry run black -- --check .
3636
- name: Run Pylint
3737
run: |
38-
./ci docker run qctrl/python-build:3.7 poetry run pylint_runner
38+
./ci docker run qctrl/python-build:3.7 poetry run pylint_runner
3939
4040
pytest:
4141
runs-on: ubuntu-latest
@@ -66,7 +66,6 @@ jobs:
6666
./ci docker run qctrl/python-build:3.7 /scripts/publish-dev-version.sh
6767
6868
sphinx_documentation:
69-
if: github.ref == 'refs/heads/master'
7069
runs-on: ubuntu-latest
7170
steps:
7271
- uses: actions/checkout@v2
@@ -80,30 +79,13 @@ jobs:
8079
-f ./docs/Dockerfile \
8180
-u $(cat .hub_user) \
8281
-p $(cat .hub_pass) \
83-
-t development \
8482
--suffix -docs
8583
- name: Update Sphinx deployment in Kubernetes (Development)
84+
if: github.ref == 'refs/heads/master'
8685
run: |
8786
./ci vault login -r ${{ secrets.VAULT_ROLE_ID }} -s ${{ secrets.VAULT_SECRET_ID }}
8887
./ci vault gcpKey -t $(cat .token) --proj q-ctrl-documentation -r docs -o ./gcloud-service-key.json
8988
gcloud auth activate-service-account --key-file=./gcloud-service-key.json
9089
gcloud config set project q-ctrl-documentation
9190
gcloud container clusters get-credentials docs-development --zone us-central1-c
9291
kubectl -n docs-dev rollout restart deployment/python-open-controls-docs
93-
94-
sphinx_documentation_test:
95-
if: github.ref != 'refs/heads/master'
96-
runs-on: ubuntu-latest
97-
steps:
98-
- uses: actions/checkout@v2
99-
- name: Build Sphinx Image and Push to DockerHub
100-
run: |
101-
source <(curl -sL http://ci.q-ctrl.com)
102-
./ci vault login -r ${{ secrets.VAULT_ROLE_ID }} -s ${{ secrets.VAULT_SECRET_ID }}
103-
./ci vault get -t $(cat .token) -p secret/data/dockerhub -k hub_user -o .hub_user
104-
./ci vault get -t $(cat .token) -p secret/data/dockerhub -k hub_pass -o .hub_pass
105-
./ci docker buildPush \
106-
-f ./docs/Dockerfile \
107-
-u $(cat .hub_user) \
108-
-p $(cat .hub_pass) \
109-
--suffix -docs

.github/workflows/on-release.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ jobs:
4141
-f ./docs/Dockerfile \
4242
-u $(cat .hub_user) \
4343
-p $(cat .hub_pass) \
44-
-t latest \
4544
--suffix -docs
4645
- name: Update Sphinx deployment in Kubernetes (Production)
4746
run: |

0 commit comments

Comments
 (0)