From 48e36af2cfb27818edda046e0af6b7a74cd9d0e4 Mon Sep 17 00:00:00 2001 From: Jorge Martinez Date: Tue, 20 May 2025 14:49:07 +0200 Subject: [PATCH 01/13] ci(workflow): optimize syntax --- .github/workflows/ci.yml | 82 ++++++++++------------------------------ 1 file changed, 20 insertions(+), 62 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index efdc8b0da16..57b20b3fee1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -179,69 +179,27 @@ jobs: standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}} secrets: inherit - retro_251: - name: "retro 251" + tests-retro: + name: "Test DPF ${{ matrix.dpf.version }} compatibility" if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft - uses: ./.github/workflows/tests.yml - with: - ANSYS_VERSION: "251" - python_versions: '["3.10"]' - DOCSTRING: false - standalone_suffix: '' - secrets: inherit - - retro_242: - name: "retro 242" - if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft - uses: ./.github/workflows/tests.yml - with: - ANSYS_VERSION: "242" - python_versions: '["3.10"]' - DOCSTRING: false - standalone_suffix: '' - secrets: inherit - - retro_241: - name: "retro 241" - if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft - uses: ./.github/workflows/tests.yml - with: - ANSYS_VERSION: "241" - python_versions: '["3.10"]' - DOCSTRING: false - standalone_suffix: '.sp01' - secrets: inherit - - retro_232: - name: "retro 232" - if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft - uses: ./.github/workflows/tests.yml - with: - ANSYS_VERSION: "232" - python_versions: '["3.10"]' - DOCSTRING: false - standalone_suffix: '' - secrets: inherit - - retro_231: - name: "retro 231" - if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft - uses: ./.github/workflows/tests.yml - with: - ANSYS_VERSION: "231" - python_versions: '["3.10"]' - DOCSTRING: false - secrets: inherit - - retro_222: - name: "retro 222" - if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft - uses: ./.github/workflows/tests.yml - with: - ANSYS_VERSION: "222" - python_versions: '["3.10"]' - DOCSTRING: false - secrets: inherit + strategy: + fail-fast: false + matrix: + dpf: + - {"version": "251", "standalone-suffix": ""} + - {"version": "242", "standalone-suffix": ""} + - {"version": "241", "standalone-suffix": ".sp01"} + - {"version": "232", "standalone-suffix": ""} + - {"version": "231", "standalone-suffix": ""} + - {"version": "222", "standalone-suffix": ""} + steps: + - uses: ./.github/workflows/tests.yml + secrets: inherit + with: + ANSYS_VERSION: ${{ matrix.dpf.version }} + python_versions: '["3.10"]' + DOCSTRING: false + standalone_suffix: ${{ matrix.dpf.standalone-suffix }} pydpf-post: name: "PyDPF-Post" From 36ee8c4bde510e9478784513d343663dc25d712d Mon Sep 17 00:00:00 2001 From: Jorge Martinez Date: Tue, 20 May 2025 14:55:41 +0200 Subject: [PATCH 02/13] fix(workflow): syntax --- .github/workflows/ci.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 57b20b3fee1..b9605f58891 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -192,14 +192,12 @@ jobs: - {"version": "232", "standalone-suffix": ""} - {"version": "231", "standalone-suffix": ""} - {"version": "222", "standalone-suffix": ""} - steps: - - uses: ./.github/workflows/tests.yml - secrets: inherit - with: - ANSYS_VERSION: ${{ matrix.dpf.version }} - python_versions: '["3.10"]' - DOCSTRING: false - standalone_suffix: ${{ matrix.dpf.standalone-suffix }} + uses: ./.github/workflows/tests.yml + with: + ANSYS_VERSION: ${{ matrix.dpf.version }} + python_versions: '["3.10"]' + DOCSTRING: false + standalone_suffix: ${{ matrix.dpf.standalone-suffix }} pydpf-post: name: "PyDPF-Post" From f76ca5ac0f35459b78fc3f644eeeff71648e05e7 Mon Sep 17 00:00:00 2001 From: moe-ad Date: Thu, 22 May 2025 09:45:07 +0200 Subject: [PATCH 03/13] ci: trigger workflow From 47fddbd3c1867d7c74f82b7d1254706ca942f337 Mon Sep 17 00:00:00 2001 From: moe-ad Date: Thu, 22 May 2025 10:06:11 +0200 Subject: [PATCH 04/13] fix: tests-retro --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b9605f58891..31b9e66905c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -198,6 +198,7 @@ jobs: python_versions: '["3.10"]' DOCSTRING: false standalone_suffix: ${{ matrix.dpf.standalone-suffix }} + secrets: inherit pydpf-post: name: "PyDPF-Post" From 3c9f0ac2fbf6fcce4704d74126ce1c0e22105216 Mon Sep 17 00:00:00 2001 From: moe-ad Date: Thu, 22 May 2025 15:17:49 +0200 Subject: [PATCH 05/13] ci: further optimization --- .github/workflows/ci.yml | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 31b9e66905c..3e30f9dbd61 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -101,18 +101,12 @@ jobs: name: ${{ steps.wheel.outputs.wheel_name }} path: dist/${{ steps.wheel.outputs.wheel_name }} - tests: - uses: ./.github/workflows/tests.yml - needs: pick_server_suffix - with: - ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '252' }} - python_versions: '["3.10"]' - wheel: true - wheelhouse: false - standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}} - secrets: inherit - - tests_any: + tests-latest: + name: "Test ${{ matrix.test-any == true && 'any' || 'platform-specific' }} wheel against latest DPF version" + strategy: + fail-fast: false + matrix: + test-any: [false, true] uses: ./.github/workflows/tests.yml needs: pick_server_suffix with: @@ -121,7 +115,7 @@ jobs: wheel: true wheelhouse: false standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}} - test_any: true + test_any: ${{ matrix.test-any }} secrets: inherit docker_tests: From acdf8360875dc2c6c1cd0b525211149d0fa27bb7 Mon Sep 17 00:00:00 2001 From: moe-ad Date: Thu, 22 May 2025 15:24:37 +0200 Subject: [PATCH 06/13] fix: test_any input type --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3e30f9dbd61..952ae332420 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -102,11 +102,11 @@ jobs: path: dist/${{ steps.wheel.outputs.wheel_name }} tests-latest: - name: "Test ${{ matrix.test-any == true && 'any' || 'platform-specific' }} wheel against latest DPF version" + name: "Test ${{ matrix.test-any == 'true' && 'any' || 'platform-specific' }} wheel against latest DPF version" strategy: fail-fast: false matrix: - test-any: [false, true] + test-any: ['false', 'true'] uses: ./.github/workflows/tests.yml needs: pick_server_suffix with: From 82efe1dc076d8eefe4b4abf7fb6787b7ee692040 Mon Sep 17 00:00:00 2001 From: moe-ad Date: Fri, 23 May 2025 08:17:41 +0200 Subject: [PATCH 07/13] ci: further optimization --- .github/workflows/ci_release.yml | 112 +++++++++---------------------- 1 file changed, 30 insertions(+), 82 deletions(-) diff --git a/.github/workflows/ci_release.yml b/.github/workflows/ci_release.yml index 13fad27c9fb..0d58bbbbd0b 100644 --- a/.github/workflows/ci_release.yml +++ b/.github/workflows/ci_release.yml @@ -133,94 +133,42 @@ jobs: standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }} secrets: inherit - retro_242: - name: "retro 242" + tests-retro: + name: "Test DPF ${{ matrix.dpf.version }} compatibility" + strategy: + fail-fast: false + matrix: + dpf: + - {"version": "242", "standalone-suffix": ""} + - {"version": "241", "standalone-suffix": ".sp01"} + - {"version": "232", "standalone-suffix": ""} + - {"version": "231", "standalone-suffix": ""} + - {"version": "222", "standalone-suffix": ""} uses: ./.github/workflows/tests.yml with: - ANSYS_VERSION: "242" + ANSYS_VERSION: ${{ matrix.dpf.version }} python_versions: '["3.10"]' DOCSTRING: false - secrets: inherit - - retro_241: - name: "retro 241" - uses: ./.github/workflows/tests.yml - with: - ANSYS_VERSION: "241" - python_versions: '["3.10"]' - standalone_suffix: '.sp01' - DOCSTRING: false - secrets: inherit - - retro_232: - name: "retro 232" - uses: ./.github/workflows/tests.yml - with: - ANSYS_VERSION: "232" - python_versions: '["3.10"]' - DOCSTRING: false - secrets: inherit - - retro_231: - name: "retro 231" - uses: ./.github/workflows/tests.yml - with: - ANSYS_VERSION: "231" - python_versions: '["3.10"]' - DOCSTRING: false - secrets: inherit - - retro_222: - name: "retro 222" - uses: ./.github/workflows/tests.yml - with: - ANSYS_VERSION: "222" - python_versions: '["3.10"]' - DOCSTRING: false - secrets: inherit - - pydpf-post_251: - name: "PyDPF-Post with 251" - uses: ./.github/workflows/pydpf-post.yml - with: - ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }} - standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }} - test_docstrings: "true" - secrets: inherit - - pydpf-post_242: - name: "PyDPF-Post with 242" - uses: ./.github/workflows/pydpf-post.yml - with: - ANSYS_VERSION: "242" - secrets: inherit - - pydpf-post_241: - name: "PyDPF-Post with 241" - uses: ./.github/workflows/pydpf-post.yml - with: - ANSYS_VERSION: "241" - secrets: inherit - - pydpf-post_232: - name: "PyDPF-Post with 232" - uses: ./.github/workflows/pydpf-post.yml - with: - ANSYS_VERSION: "232" - secrets: inherit - - pydpf-post_231: - name: "PyDPF-Post with 231" - uses: ./.github/workflows/pydpf-post.yml - with: - ANSYS_VERSION: "231" - secrets: inherit - - pydpf-post_222: - name: "PyDPF-Post with 222" + standalone_suffix: ${{ matrix.dpf.standalone-suffix }} + secrets: inherit + + tests-pydpf-post: + name: "Test PyDPF-Post with ${{ matrix.dpf.version}}" + strategy: + fail-fast: false + matrix: + dpf: + - {"version": "${{ github.event.inputs.ansys_version || '251' }}", "standalone-suffix": "${{ github.event.inputs.standalone_branch_suffix || '' }}", "test_docstrings": "true"} + - {"version": "242", "standalone-suffix": "", "test_docstrings": "false"} + - {"version": "241", "standalone-suffix": "", "test_docstrings": "false"} + - {"version": "232", "standalone-suffix": "", "test_docstrings": "false"} + - {"version": "231", "standalone-suffix": "", "test_docstrings": "false"} + - {"version": "222", "standalone-suffix": "", "test_docstrings": "false"} uses: ./.github/workflows/pydpf-post.yml with: - ANSYS_VERSION: "222" + ANSYS_VERSION: ${{ matrix.dpf.version }} + standalone_suffix: ${{ matrix.dpf.standalone-suffix }} + test_docstrings: ${{ matrix.dpf.test_docstrings }} secrets: inherit docker_tests: From 0f39f2a404e6a118e4096c6a6637c51e265e602e Mon Sep 17 00:00:00 2001 From: moe-ad Date: Fri, 30 May 2025 10:43:10 +0200 Subject: [PATCH 08/13] ci: optimize release workflow --- .github/workflows/ci_release.yml | 66 ++++++++++++++------------------ 1 file changed, 29 insertions(+), 37 deletions(-) diff --git a/.github/workflows/ci_release.yml b/.github/workflows/ci_release.yml index d69ca6f65df..36b4dec42d3 100644 --- a/.github/workflows/ci_release.yml +++ b/.github/workflows/ci_release.yml @@ -73,48 +73,40 @@ jobs: name: ${{ steps.wheel.outputs.wheel_name }} path: dist/${{ steps.wheel.outputs.wheel_name }} - tests_3_10: - uses: ./.github/workflows/tests.yml - with: - ANSYS_VERSION: ${{ inputs.ansys_version || '251' }} - python_versions: '["3.10"]' - wheel: true - wheelhouse: true - standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }} - secrets: inherit - tests: + name: "Test ${{ matrix.test_any == 'true' && 'any' || 'platform-specific' }} wheel" uses: ./.github/workflows/tests.yml + strategy: + matrix: + include: + - python_versions: '["3.10"]' + wheel: true + wheelhouse: true + DOCSTRING: true + test_any: false + - python_versions: '["3.11", "3.12", "3.13"]' + wheel: false + wheelhouse: true + DOCSTRING: false + test_any: false + - python_versions: '["3.10"]' + wheel: true + wheelhouse: false + DOCSTRING: true + test_any: true + - python_versions: '["3.11", "3.12", "3.13"]' + wheel: false + wheelhouse: false + DOCSTRING: false + test_any: true with: ANSYS_VERSION: ${{ inputs.ansys_version || '251' }} - python_versions: '["3.11", "3.12", "3.13"]' - DOCSTRING: false - wheel: false - wheelhouse: true - standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }} - secrets: inherit - - tests_any_3_10: - uses: ./.github/workflows/tests.yml - with: - ANSYS_VERSION: ${{ inputs.ansys_version || '251' }} - python_versions: '["3.10"]' - wheel: true - wheelhouse: false - standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }} - test_any: true - secrets: inherit - - tests_any: - uses: ./.github/workflows/tests.yml - with: - ANSYS_VERSION: ${{ inputs.ansys_version || '251' }} - python_versions: '["3.11", "3.12", "3.13"]' - DOCSTRING: false - wheel: false - wheelhouse: false + python_versions: ${{ matrix.python_versions }} + wheel: ${{ matrix.wheel }} + wheelhouse: ${{ matrix.wheelhouse }} + DOCSTRING: ${{ matrix.DOCSTRING }} + test_any: ${{ matrix.test_any }} standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }} - test_any: true secrets: inherit docs: From 6d9fcbfec497b4db4fcb81877830f162a2d53fcd Mon Sep 17 00:00:00 2001 From: moe-ad Date: Fri, 30 May 2025 10:46:23 +0200 Subject: [PATCH 09/13] ci: draft release needs update --- .github/workflows/ci_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_release.yml b/.github/workflows/ci_release.yml index 36b4dec42d3..b253f5534a6 100644 --- a/.github/workflows/ci_release.yml +++ b/.github/workflows/ci_release.yml @@ -183,7 +183,7 @@ jobs: draft_release: name: "Draft Release" if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') - needs: [style, tests, tests_3_10, tests_any, tests_any_3_10, docs, examples, retro_232, retro_231, retro_222, docker_tests] + needs: [style, tests, docs, examples, tests-retro, docker_tests] runs-on: ubuntu-latest steps: - name: "Download artifacts" From 1949415ae0e9e1a63d74ae8708babf1cff8031db Mon Sep 17 00:00:00 2001 From: moe-ad Date: Fri, 30 May 2025 10:58:06 +0200 Subject: [PATCH 10/13] ci: fix naming logic --- .github/workflows/ci_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_release.yml b/.github/workflows/ci_release.yml index b253f5534a6..a8aefc150ba 100644 --- a/.github/workflows/ci_release.yml +++ b/.github/workflows/ci_release.yml @@ -74,7 +74,7 @@ jobs: path: dist/${{ steps.wheel.outputs.wheel_name }} tests: - name: "Test ${{ matrix.test_any == 'true' && 'any' || 'platform-specific' }} wheel" + name: "Test ${{ matrix.test_any && 'any' || 'platform-specific' }} wheel" uses: ./.github/workflows/tests.yml strategy: matrix: From 2799499cbde0f93b382eab12841b5099a951eb18 Mon Sep 17 00:00:00 2001 From: Paul Profizi <100710998+PProfizi@users.noreply.github.com> Date: Mon, 2 Jun 2025 11:18:11 +0200 Subject: [PATCH 11/13] Fix doctest input in test matrix --- .github/workflows/ci_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_release.yml b/.github/workflows/ci_release.yml index a8aefc150ba..d603d910e03 100644 --- a/.github/workflows/ci_release.yml +++ b/.github/workflows/ci_release.yml @@ -92,7 +92,7 @@ jobs: - python_versions: '["3.10"]' wheel: true wheelhouse: false - DOCSTRING: true + DOCSTRING: false test_any: true - python_versions: '["3.11", "3.12", "3.13"]' wheel: false From b32369131898f013afb19593d118ae262d9ff99e Mon Sep 17 00:00:00 2001 From: Paul Profizi <100710998+PProfizi@users.noreply.github.com> Date: Mon, 2 Jun 2025 11:23:10 +0200 Subject: [PATCH 12/13] Update conditional for doctest step in tests.yml --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 755009416ef..46c3d733592 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -209,7 +209,7 @@ jobs: DEBUG: true - name: "Test Docstrings" - if: (inputs.DOCSTRING == 'true') && !((inputs.test_any == 'true') && (matrix.os == 'ubuntu-latest')) + if: (inputs.DOCSTRING == 'true') uses: ansys/pydpf-actions/test_docstrings@v2.3 with: MODULE: ${{env.MODULE}} From c3f9101194cc3e1e752f2d898b8fe1e0d8f31129 Mon Sep 17 00:00:00 2001 From: Paul Profizi <100710998+PProfizi@users.noreply.github.com> Date: Mon, 2 Jun 2025 11:24:53 +0200 Subject: [PATCH 13/13] Update DOCSTRING parameter in tests-latest step for ci.yml --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 75e6ca8e56d..3d16eb0b598 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -115,6 +115,7 @@ jobs: wheelhouse: false standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}} test_any: ${{ matrix.test-any }} + DOCSTRING: ${{ !matrix.test-any }} secrets: inherit docker_tests: