From e387e9167f70fbc5d8dd61529ee9cf9c0a834a2d Mon Sep 17 00:00:00 2001 From: eastandwestwind Date: Wed, 6 Jul 2022 16:12:24 -0500 Subject: [PATCH 01/11] test fixing publish_docs ci action --- .github/workflows/publish_docs.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/publish_docs.yaml b/.github/workflows/publish_docs.yaml index d32ebc454..3e2e81dbb 100644 --- a/.github/workflows/publish_docs.yaml +++ b/.github/workflows/publish_docs.yaml @@ -13,6 +13,9 @@ jobs: steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 + with: + python-version: 3.9 + cache: "pip" - run: pip install -r docs/fidesops/requirements.txt - name: Build docs run: make docs-build From 2441e5d7b28a73952ece6f5746cba250d7c4bc99 Mon Sep 17 00:00:00 2001 From: eastandwestwind Date: Wed, 6 Jul 2022 16:16:15 -0500 Subject: [PATCH 02/11] update branch target to --- .github/workflows/publish_docs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_docs.yaml b/.github/workflows/publish_docs.yaml index 3e2e81dbb..623ef7632 100644 --- a/.github/workflows/publish_docs.yaml +++ b/.github/workflows/publish_docs.yaml @@ -3,7 +3,7 @@ name: Publish updated docs to gh-pages on: push: branches: - - main + - docs_test_branch paths: - "docs/**" From 54959c38671d7bd3607748972a5cf4397ba3a38c Mon Sep 17 00:00:00 2001 From: eastandwestwind Date: Wed, 6 Jul 2022 16:23:25 -0500 Subject: [PATCH 03/11] try another commit to see if publish_docs is triggered From f441b041a1d736ea8f97f299fb82fb1051f971d3 Mon Sep 17 00:00:00 2001 From: eastandwestwind Date: Wed, 6 Jul 2022 16:31:17 -0500 Subject: [PATCH 04/11] revert change to branch target --- .github/workflows/publish_docs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_docs.yaml b/.github/workflows/publish_docs.yaml index 623ef7632..3e2e81dbb 100644 --- a/.github/workflows/publish_docs.yaml +++ b/.github/workflows/publish_docs.yaml @@ -3,7 +3,7 @@ name: Publish updated docs to gh-pages on: push: branches: - - docs_test_branch + - main paths: - "docs/**" From 6c01e11cd42bae0077880493d9b7d7468ecc487c Mon Sep 17 00:00:00 2001 From: Catherine Smith Date: Wed, 6 Jul 2022 16:52:32 -0500 Subject: [PATCH 05/11] allow publish docs on test branch (#819) * allow publish docs on test branch * remove main --- .github/workflows/publish_docs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_docs.yaml b/.github/workflows/publish_docs.yaml index 3e2e81dbb..623ef7632 100644 --- a/.github/workflows/publish_docs.yaml +++ b/.github/workflows/publish_docs.yaml @@ -3,7 +3,7 @@ name: Publish updated docs to gh-pages on: push: branches: - - main + - docs_test_branch paths: - "docs/**" From b7b4bbf0ec3a13cce0b10d8815e18a705190cada Mon Sep 17 00:00:00 2001 From: eastandwestwind Date: Wed, 6 Jul 2022 17:08:53 -0500 Subject: [PATCH 06/11] trying new empty commit From 7addb4c337b3d8071a3d6b4c0853c0e59b94cac6 Mon Sep 17 00:00:00 2001 From: eastandwestwind Date: Wed, 6 Jul 2022 17:09:49 -0500 Subject: [PATCH 07/11] reverting to main --- .github/workflows/publish_docs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_docs.yaml b/.github/workflows/publish_docs.yaml index 623ef7632..3e2e81dbb 100644 --- a/.github/workflows/publish_docs.yaml +++ b/.github/workflows/publish_docs.yaml @@ -3,7 +3,7 @@ name: Publish updated docs to gh-pages on: push: branches: - - docs_test_branch + - main paths: - "docs/**" From 45fc39f97f5e68ecdb8f728935c0450d161d6396 Mon Sep 17 00:00:00 2001 From: Paul Sanders Date: Wed, 6 Jul 2022 22:06:07 -0400 Subject: [PATCH 08/11] Temporarly disable paths --- .github/workflows/publish_docs.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish_docs.yaml b/.github/workflows/publish_docs.yaml index 3e2e81dbb..ed51e235e 100644 --- a/.github/workflows/publish_docs.yaml +++ b/.github/workflows/publish_docs.yaml @@ -3,10 +3,9 @@ name: Publish updated docs to gh-pages on: push: branches: - - main - paths: - - "docs/**" - + - docs_test_branch + # paths: + # - "docs/**" jobs: publish_docs: runs-on: ubuntu-latest @@ -21,4 +20,3 @@ jobs: run: make docs-build - name: Publish docs run: mkdocs gh-deploy -v -f docs/fidesops/mkdocs.yml --force - \ No newline at end of file From 695e53269e0b76ff8ab31958c13cf0a1ed6d77c7 Mon Sep 17 00:00:00 2001 From: Paul Sanders Date: Thu, 7 Jul 2022 06:21:25 -0400 Subject: [PATCH 09/11] Revert temporary test --- .github/workflows/publish_docs.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish_docs.yaml b/.github/workflows/publish_docs.yaml index ed51e235e..d8af99218 100644 --- a/.github/workflows/publish_docs.yaml +++ b/.github/workflows/publish_docs.yaml @@ -3,9 +3,9 @@ name: Publish updated docs to gh-pages on: push: branches: - - docs_test_branch - # paths: - # - "docs/**" + - main + paths: + - "docs/**" jobs: publish_docs: runs-on: ubuntu-latest From 9fb04c4f449a639c4847f860d4a43897f3d7c1cb Mon Sep 17 00:00:00 2001 From: eastandwestwind Date: Thu, 7 Jul 2022 09:57:53 -0500 Subject: [PATCH 10/11] Add makefile --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb4be57de..412c51503 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,7 +30,7 @@ The types of changes are: * Resolve issue with MyPy seeing files in fidesops as missing imports [#719](https://github.com/ethyca/fidesops/pull/719) * Fixed `check-migrations` Make command [#806](https://github.com/ethyca/fidesops/pull/806) * Fix issue requiring separate install of snowflake-connector-python [#807](https://github.com/ethyca/fidesops/pull/807) - +* Fix publish_docs CI action [#818](https://github.com/ethyca/fidesops/pull/818) ## [1.6.1](https://github.com/ethyca/fidesops/compare/1.6.0...1.6.1) From e05d2633d09acb7343c3425266f40691f7d295d9 Mon Sep 17 00:00:00 2001 From: eastandwestwind Date: Thu, 7 Jul 2022 09:59:22 -0500 Subject: [PATCH 11/11] pull latest --- .github/workflows/publish_docs.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/publish_docs.yaml b/.github/workflows/publish_docs.yaml index d8af99218..e9a310e86 100644 --- a/.github/workflows/publish_docs.yaml +++ b/.github/workflows/publish_docs.yaml @@ -6,6 +6,7 @@ on: - main paths: - "docs/**" + jobs: publish_docs: runs-on: ubuntu-latest