From 7424799d33f5af4d40b07664aefd5233e2cb729c Mon Sep 17 00:00:00 2001 From: felixkuhn3000 <58187811+felixkuhn3000@users.noreply.github.com> Date: Tue, 21 May 2024 13:34:38 +0200 Subject: [PATCH 1/4] removed release from ci_cd.yml and added upload_docs_release to release.yml --- .github/workflows/ci_cd.yml | 84 ----------------------------------- .github/workflows/release.yml | 14 ++++++ 2 files changed, 14 insertions(+), 84 deletions(-) diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml index 8cff5b4..08e43a3 100644 --- a/.github/workflows/ci_cd.yml +++ b/.github/workflows/ci_cd.yml @@ -38,29 +38,6 @@ jobs: - name: Run pre-commit hook uses: pre-commit/action@v3.0.1 - build: - name: Build project - needs: [style] - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: [windows-latest, ubuntu-latest] - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Setup Go - uses: actions/setup-go@v5 - with: - go-version-file: 'go.mod' - cache-dependency-path: 'go.sum' - - - name: Verify library builds - run: | - go build ./pkg/externalfunctions - doc-style: name: "Documentation style" runs-on: ubuntu-latest @@ -149,54 +126,6 @@ jobs: name: documentation-html-with-api path: documentation-html - release: - name: Generate GitHub release - if: github.event_name == 'push' && contains(github.ref, 'refs/tags') - needs: [doc-api-reference, build] - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Release to GitHub - uses: softprops/action-gh-release@v2 - with: - fail_on_unmatched_files: false - generate_release_notes: true - - main-repo-release: - name: Update main pyconv repo and create release - if: github.event_name == 'push' && contains(github.ref, 'refs/tags') - needs: [release] - runs-on: ubuntu-latest - steps: - - name: Checkout pyconv repository - run: | - git clone --branch main https://${{ secrets.PYCONV_RELEASE_TOKEN }}@github.com/ansys-internal/pyconv.git - - - name: Setup Go - uses: actions/setup-go@v5 - with: - go-version-file: 'pyconv/scripts/releasehelper/go.mod' - - - name: Run tag script - run: | - cd pyconv/scripts/releasehelper - go run main.go "tag" ${{ github.ref_name }} ${{ secrets.PYCONV_RELEASE_TOKEN }} - - - name: Commit and push to pyconv - run: | - cd pyconv - git config --global user.email '${{ github.actor }}@users.noreply.github.com' - git config --global user.name '${{ github.actor }}' - git commit -a -m 'New release triggered by ${{ github.event.repository.name }}' - git push origin main - - - name: Run release script - run: | - cd pyconv/scripts/releasehelper - go run main.go "release" ${{ github.ref_name }} ${{ secrets.PYCONV_RELEASE_TOKEN }} - upload_dev_docs: name: Upload dev documentation if: github.ref == 'refs/heads/main' @@ -209,16 +138,3 @@ jobs: cname: ${{ env.DOCUMENTATION_CNAME }} token: ${{ secrets.GITHUB_TOKEN }} doc-artifact-name: documentation-html-with-api - - upload_docs_release: - name: Upload release documentation - if: github.event_name == 'push' && contains(github.ref, 'refs/tags') - runs-on: ubuntu-latest - needs: [release] - steps: - - name: Deploy the stable documentation - uses: ansys/actions/doc-deploy-stable@v6 - with: - cname: ${{ env.DOCUMENTATION_CNAME }} - token: ${{ secrets.GITHUB_TOKEN }} - doc-artifact-name: documentation-html-with-api diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c8e760b..db43aba 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -165,3 +165,17 @@ jobs: platforms: linux/amd64,linux/arm64 tags: | ghcr.io/${{ github.repository }}:${{ github.ref_name }} + + upload_docs_release: + name: Upload release documentation + if: github.event_name == 'push' && contains(github.ref, 'refs/tags') + runs-on: ubuntu-latest + needs: [release] + steps: + - name: Deploy the stable documentation + uses: ansys/actions/doc-deploy-stable@v6 + with: + cname: ${{ env.DOCUMENTATION_CNAME }} + token: ${{ secrets.GITHUB_TOKEN }} + doc-artifact-name: documentation-html-with-api + \ No newline at end of file From 5445c435ed700c2a03271f76baceedaf5081cb0f Mon Sep 17 00:00:00 2001 From: FelixKuhnAnsys Date: Mon, 27 May 2024 11:35:20 +0200 Subject: [PATCH 2/4] Update ci_cd.yml --- .github/workflows/ci_cd.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml index 08e43a3..221f1f2 100644 --- a/.github/workflows/ci_cd.yml +++ b/.github/workflows/ci_cd.yml @@ -38,6 +38,29 @@ jobs: - name: Run pre-commit hook uses: pre-commit/action@v3.0.1 + build: + name: Build project + needs: [style] + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [windows-latest, ubuntu-latest] + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Setup Go + uses: actions/setup-go@v5 + with: + go-version-file: 'go.mod' + cache-dependency-path: 'go.sum' + + - name: Verify library builds + run: | + go build ./pkg/externalfunctions + doc-style: name: "Documentation style" runs-on: ubuntu-latest From 833d75aa637635aef5f3f5cd9539285f9ed87523 Mon Sep 17 00:00:00 2001 From: Felix Kuhn <120018181+FelixKuhnAnsys@users.noreply.github.com> Date: Mon, 27 May 2024 11:37:43 +0200 Subject: [PATCH 3/4] update (#20) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/release.yml | 6 +++--- doc/requirements.txt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index db43aba..66dc597 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,10 +15,10 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version-file: 'go.mod' cache-dependency-path: 'go.sum' @@ -100,7 +100,7 @@ jobs: path: dist - name: Release to GitHub - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: fail_on_unmatched_files: true generate_release_notes: true diff --git a/doc/requirements.txt b/doc/requirements.txt index 469b9ed..ecd1d8e 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,6 +1,6 @@ -ansys-sphinx-theme==0.16.0 +ansys-sphinx-theme==0.16.2 Sphinx==7.3.7 sphinx-copybutton==0.5.2 -sphinx-design==0.5.0 -sphinx-notfound-page==1.0.0 +sphinx-design==0.6.0 +sphinx-notfound-page==1.0.2 sphinxemoji==0.3.1 From 4aa87f613b5b8cfefad8677ce6ae33ca0a40d947 Mon Sep 17 00:00:00 2001 From: FelixKuhnAnsys Date: Mon, 27 May 2024 11:45:09 +0200 Subject: [PATCH 4/4] Update release.yml --- .github/workflows/release.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 66dc597..1aacf9e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -165,7 +165,7 @@ jobs: platforms: linux/amd64,linux/arm64 tags: | ghcr.io/${{ github.repository }}:${{ github.ref_name }} - + upload_docs_release: name: Upload release documentation if: github.event_name == 'push' && contains(github.ref, 'refs/tags') @@ -178,4 +178,3 @@ jobs: cname: ${{ env.DOCUMENTATION_CNAME }} token: ${{ secrets.GITHUB_TOKEN }} doc-artifact-name: documentation-html-with-api - \ No newline at end of file