From 9e453eaba49ddd753384c59db9c4599d780599c7 Mon Sep 17 00:00:00 2001 From: Ludovic Steinbach Date: Tue, 14 Mar 2023 17:35:29 +0100 Subject: [PATCH 1/8] Fix job dependency --- .github/workflows/ci_cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml index ee9d497f..d9ad59ea 100644 --- a/.github/workflows/ci_cd.yml +++ b/.github/workflows/ci_cd.yml @@ -53,7 +53,7 @@ jobs: Release: if: contains(github.ref, 'refs/tags') && github.event_name == 'push' - needs: doc-deploy-dev + needs: integration_checks runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 From 3afd2dc622efd39c238fcef7b8212f2b70f75127 Mon Sep 17 00:00:00 2001 From: Ludovic Steinbach Date: Tue, 14 Mar 2023 17:47:09 +0100 Subject: [PATCH 2/8] Disable conditions and unwanted release steps --- .github/workflows/ci_cd.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml index d9ad59ea..dab49762 100644 --- a/.github/workflows/ci_cd.yml +++ b/.github/workflows/ci_cd.yml @@ -52,7 +52,7 @@ jobs: doc-artifact-name: Documentation-html Release: - if: contains(github.ref, 'refs/tags') && github.event_name == 'push' +# if: contains(github.ref, 'refs/tags') && github.event_name == 'push' needs: integration_checks runs-on: ubuntu-latest steps: @@ -72,21 +72,21 @@ jobs: with: name: Documentation-pdf - - name: "Deploy stable documentation" - uses: pyansys/actions/doc-deploy-stable@v4 - with: - cname: ${{ env.DOCUMENTATION_CNAME }} - token: ${{ secrets.GITHUB_TOKEN }} - doc-artifact-name: Documentation-html +# - name: "Deploy stable documentation" +# uses: pyansys/actions/doc-deploy-stable@v4 +# with: +# cname: ${{ env.DOCUMENTATION_CNAME }} +# token: ${{ secrets.GITHUB_TOKEN }} +# doc-artifact-name: Documentation-html - # note how we use the PyPI tokens - - name: Upload to PyPI - run: | - pip install twine - twine upload --non-interactive --skip-existing ~/**/*.whl - env: - TWINE_USERNAME: __token__ - TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }} +# # note how we use the PyPI tokens +# - name: Upload to PyPI +# run: | +# pip install twine +# twine upload --non-interactive --skip-existing ~/**/*.whl +# env: +# TWINE_USERNAME: __token__ +# TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }} - name: Release uses: softprops/action-gh-release@v1 From 48ebca2b3cb360c9c920bc9e134bb14c4089cba6 Mon Sep 17 00:00:00 2001 From: Ludovic Steinbach Date: Tue, 14 Mar 2023 18:00:35 +0100 Subject: [PATCH 3/8] DL artifacts and add to rlelease --- .github/workflows/ci_cd.yml | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml index dab49762..787b7120 100644 --- a/.github/workflows/ci_cd.yml +++ b/.github/workflows/ci_cd.yml @@ -71,6 +71,18 @@ jobs: - uses: actions/download-artifact@v3 with: name: Documentation-pdf + path: ~/dist + + - uses: actions/download-artifact@v3 + with: + name: Documentation-html + path: ~/dist + + - name: "Compressing HTML documentation" + uses: vimtor/action-zip@v1.1 + with: + files: ~/dist/Documentation-html + dest: ~/dist/documentation-html.zip # - name: "Deploy stable documentation" # uses: pyansys/actions/doc-deploy-stable@v4 @@ -91,8 +103,11 @@ jobs: - name: Release uses: softprops/action-gh-release@v1 with: + prerelease: true + tag_name: v1.1.3b0 + draft: true generate_release_notes: true files: | - ~/**/*.whl - ./**/*.zip - ./**/*.pdf + ~/dist/*.whl + ~/dist/documentation-html.zip + ~/dist/*.pdf From eea74481cb7834b2dae3ae36f6f18401dc744f38 Mon Sep 17 00:00:00 2001 From: Ludovic Steinbach Date: Tue, 14 Mar 2023 18:30:25 +0100 Subject: [PATCH 4/8] Fix paths --- .github/workflows/ci_cd.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml index 787b7120..256b35eb 100644 --- a/.github/workflows/ci_cd.yml +++ b/.github/workflows/ci_cd.yml @@ -66,23 +66,23 @@ jobs: - uses: actions/download-artifact@v3 with: name: ansys-grantami-bomanalytics-wheel - path: ~/dist + path: dist - uses: actions/download-artifact@v3 with: name: Documentation-pdf - path: ~/dist + path: dist - uses: actions/download-artifact@v3 with: name: Documentation-html - path: ~/dist + path: dist/documentation-html/ - name: "Compressing HTML documentation" uses: vimtor/action-zip@v1.1 with: - files: ~/dist/Documentation-html - dest: ~/dist/documentation-html.zip + files: dist/documentation-html/ + dest: dist/documentation-html.zip # - name: "Deploy stable documentation" # uses: pyansys/actions/doc-deploy-stable@v4 @@ -108,6 +108,6 @@ jobs: draft: true generate_release_notes: true files: | - ~/dist/*.whl - ~/dist/documentation-html.zip - ~/dist/*.pdf + dist/*.whl + dist/documentation-html.zip + dist/*.pdf From 15c856d21d7159d4359f75ffdd9b1bf42bd91e29 Mon Sep 17 00:00:00 2001 From: Ludovic Steinbach Date: Tue, 14 Mar 2023 19:41:19 +0100 Subject: [PATCH 5/8] Revert "Disable conditions and unwanted release steps" This reverts commit 3afd2dc622efd39c238fcef7b8212f2b70f75127. --- .github/workflows/ci_cd.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml index 256b35eb..6cea443b 100644 --- a/.github/workflows/ci_cd.yml +++ b/.github/workflows/ci_cd.yml @@ -52,7 +52,7 @@ jobs: doc-artifact-name: Documentation-html Release: -# if: contains(github.ref, 'refs/tags') && github.event_name == 'push' + if: contains(github.ref, 'refs/tags') && github.event_name == 'push' needs: integration_checks runs-on: ubuntu-latest steps: @@ -84,21 +84,21 @@ jobs: files: dist/documentation-html/ dest: dist/documentation-html.zip -# - name: "Deploy stable documentation" -# uses: pyansys/actions/doc-deploy-stable@v4 -# with: -# cname: ${{ env.DOCUMENTATION_CNAME }} -# token: ${{ secrets.GITHUB_TOKEN }} -# doc-artifact-name: Documentation-html + - name: "Deploy stable documentation" + uses: pyansys/actions/doc-deploy-stable@v4 + with: + cname: ${{ env.DOCUMENTATION_CNAME }} + token: ${{ secrets.GITHUB_TOKEN }} + doc-artifact-name: Documentation-html -# # note how we use the PyPI tokens -# - name: Upload to PyPI -# run: | -# pip install twine -# twine upload --non-interactive --skip-existing ~/**/*.whl -# env: -# TWINE_USERNAME: __token__ -# TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }} + # note how we use the PyPI tokens + - name: Upload to PyPI + run: | + pip install twine + twine upload --non-interactive --skip-existing ~/**/*.whl + env: + TWINE_USERNAME: __token__ + TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }} - name: Release uses: softprops/action-gh-release@v1 From 7caa4a05aed7d45656029562eb06ff6ad38a98ce Mon Sep 17 00:00:00 2001 From: Ludovic Steinbach Date: Tue, 14 Mar 2023 19:44:05 +0100 Subject: [PATCH 6/8] Fix condition for dev docs deploy --- .github/workflows/ci_cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml index 6cea443b..2ba53057 100644 --- a/.github/workflows/ci_cd.yml +++ b/.github/workflows/ci_cd.yml @@ -43,7 +43,7 @@ jobs: name: "Deploy development documentation" runs-on: ubuntu-latest needs: [ integration_checks ] - if: github.event_name == 'push' + if: github.event_name == 'push' && !contains(github.ref, 'refs/tags') steps: - uses: pyansys/actions/doc-deploy-dev@v4 with: From 0d9a6be1dbf8b19dce965b067a51cbddffa81c9d Mon Sep 17 00:00:00 2001 From: Ludovic Steinbach Date: Tue, 14 Mar 2023 19:47:56 +0100 Subject: [PATCH 7/8] Update documentation path --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 80fd304b..2e77f3d0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,7 @@ license = "MIT" authors = ["ANSYS, Inc."] maintainers = ["PyAnsys Maintainers "] repository = "https://github.com/pyansys/grantami-bomanalytics" -documentation = "https://grantami.docs.pyansys.com" +documentation = "https://bomanalytics.grantami.docs.pyansys.com" readme = "README.rst" keywords = [ "Ansys", From 414b9a6ce1e2e458d1c4f4048100ed3f68ea78b0 Mon Sep 17 00:00:00 2001 From: Ludovic Steinbach Date: Tue, 14 Mar 2023 20:19:02 +0100 Subject: [PATCH 8/8] Remove extra args in gh release --- .github/workflows/ci_cd.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml index 2ba53057..ab044355 100644 --- a/.github/workflows/ci_cd.yml +++ b/.github/workflows/ci_cd.yml @@ -103,9 +103,6 @@ jobs: - name: Release uses: softprops/action-gh-release@v1 with: - prerelease: true - tag_name: v1.1.3b0 - draft: true generate_release_notes: true files: | dist/*.whl