From 6689a67809e14c17bedd0fdbdca50ad87087fae6 Mon Sep 17 00:00:00 2001 From: pedrominatel Date: Mon, 15 Jan 2024 15:57:59 +0000 Subject: [PATCH 1/4] Changed the docs server from preview to deploy --- .github/workflows/docs_deploy.yml | 10 +++---- .github/workflows/docs_preview.yml | 48 ------------------------------ 2 files changed, 5 insertions(+), 53 deletions(-) delete mode 100644 .github/workflows/docs_preview.yml diff --git a/.github/workflows/docs_deploy.yml b/.github/workflows/docs_deploy.yml index 7a1123454ae..0d34e7456e6 100644 --- a/.github/workflows/docs_deploy.yml +++ b/.github/workflows/docs_deploy.yml @@ -4,6 +4,7 @@ on: push: branches: - release/* + - master paths: - 'docs/**' - '.github/workflows/docs.yml' @@ -27,12 +28,11 @@ jobs: env: # Deploy to production server # DOCS_BUILD_DIR: "./docs/_build/" - DOCS_DEPLOY_PRIVATEKEY: ${{ secrets.DOCS_PROD_PRIVATEKEY }} - DOCS_DEPLOY_PATH: ${{ secrets.DOCS_PROD_PATH }} + DOCS_DEPLOY_PRIVATEKEY: ${{ secrets.DOCS_KEY }} + DOCS_DEPLOY_PATH: ${{ secrets.DOCS_PATH }} DOCS_DEPLOY_SERVER: ${{ secrets.DOCS_SERVER }} - DOCS_DEPLOY_SERVER_USER: ${{ secrets.DOCS_PROD_USER }} - DOCS_DEPLOY_URL_BASE: ${{ secrets.DOCS_PROD_URL_BASE }} - # Deploy to preview server + DOCS_DEPLOY_SERVER_USER: ${{ secrets.DOCS_USER }} + DOCS_DEPLOY_URL_BASE: ${{ secrets.DOCS_URL }} run: | sudo apt update sudo apt install python3-pip python3-setuptools diff --git a/.github/workflows/docs_preview.yml b/.github/workflows/docs_preview.yml deleted file mode 100644 index 3923839ada0..00000000000 --- a/.github/workflows/docs_preview.yml +++ /dev/null @@ -1,48 +0,0 @@ -name: Documentation Build and Preview Deploy CI - -on: - push: - branches: - - master - paths: - - 'docs/**' - - '.github/workflows/docs.yml' - -jobs: - - deploy-preview-docs: - name: Deploy Documentation - runs-on: ubuntu-22.04 - defaults: - run: - shell: bash - steps: - - uses: actions/checkout@v3 - with: - submodules: true - - uses: actions/setup-python@v4 - with: - python-version: '3.10' - - name: Deploy Preview - env: - # Deploy to preview server - # DOCS_BUILD_DIR: "./docs/_build" - DOCS_DEPLOY_PRIVATEKEY: ${{ secrets.DOCS_KEY }} - DOCS_DEPLOY_PATH: ${{ secrets.DOCS_PATH }} - DOCS_DEPLOY_SERVER: ${{ secrets.DOCS_SERVER }} - DOCS_DEPLOY_SERVER_USER: ${{ secrets.DOCS_USER }} - DOCS_DEPLOY_URL_BASE: ${{ secrets.DOCS_URL }} - run: | - sudo apt update - sudo apt install python3-pip python3-setuptools - source ./docs/utils.sh - add_doc_server_ssh_keys $DOCS_DEPLOY_PRIVATEKEY $DOCS_DEPLOY_SERVER $DOCS_DEPLOY_SERVER_USER - export GIT_VER=$(git describe --always) - echo "PIP install requirements..." - pip3 install --user -r ./docs/requirements.txt - echo "Building the Docs..." - cd ./docs && build-docs -l en - echo "Deploy the Docs..." - export DOCS_BUILD_DIR=$GITHUB_WORKSPACE/docs/ - cd $GITHUB_WORKSPACE/docs - deploy-docs From 301a62ced594a671c3777b0adc383a548d607fe4 Mon Sep 17 00:00:00 2001 From: pedrominatel Date: Mon, 15 Jan 2024 15:59:02 +0000 Subject: [PATCH 2/4] Removed one extra line --- .github/workflows/docs_build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/docs_build.yml b/.github/workflows/docs_build.yml index 2de8f347265..d20a6421d99 100644 --- a/.github/workflows/docs_build.yml +++ b/.github/workflows/docs_build.yml @@ -42,4 +42,3 @@ jobs: with: name: docs path: docs - From a5c03bd9856e5bcf7702d1e497c2cedf540923e6 Mon Sep 17 00:00:00 2001 From: pedrominatel Date: Wed, 17 Jan 2024 14:14:57 +0000 Subject: [PATCH 3/4] Added on release action to the docs deploy CI --- .github/workflows/docs_deploy.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/docs_deploy.yml b/.github/workflows/docs_deploy.yml index 0d34e7456e6..5f842bff92e 100644 --- a/.github/workflows/docs_deploy.yml +++ b/.github/workflows/docs_deploy.yml @@ -1,6 +1,8 @@ name: Documentation Build and Production Deploy CI on: + release: + types: [published] push: branches: - release/* From 58f27ebe977de1586f290ea2094c495d65127b8c Mon Sep 17 00:00:00 2001 From: pedrominatel Date: Wed, 17 Jan 2024 15:11:23 +0000 Subject: [PATCH 4/4] Fix CI workflow file name in the path --- .github/workflows/docs_build.yml | 4 ++-- .github/workflows/docs_deploy.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docs_build.yml b/.github/workflows/docs_build.yml index d20a6421d99..2009425a33e 100644 --- a/.github/workflows/docs_build.yml +++ b/.github/workflows/docs_build.yml @@ -7,11 +7,11 @@ on: - release/* paths: - 'docs/**' - - '.github/workflows/docs.yml' + - '.github/workflows/docs_build.yml' pull_request: paths: - 'docs/**' - - '.github/workflows/docs.yml' + - '.github/workflows/docs_build.yml' jobs: diff --git a/.github/workflows/docs_deploy.yml b/.github/workflows/docs_deploy.yml index 5f842bff92e..a8021f67e34 100644 --- a/.github/workflows/docs_deploy.yml +++ b/.github/workflows/docs_deploy.yml @@ -9,7 +9,7 @@ on: - master paths: - 'docs/**' - - '.github/workflows/docs.yml' + - '.github/workflows/docs_deploy.yml' jobs: