diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 144b29c67c..65ad85f624 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -225,7 +225,7 @@ jobs: secrets: inherit tests-retro: - name: "Test DPF ${{ matrix.dpf.version }} compatibility" + name: "Test DPF ${{ matrix.version }} compatibility" if: | github.event.action != 'closed' && (github.event.action != 'labeled' || github.event.label.name == 'deploy-pr-doc') && @@ -233,20 +233,15 @@ jobs: strategy: fail-fast: false matrix: - dpf: - - {"version": "252", "standalone-suffix": ""} - - {"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": ""} + version: + - ${{ fromJson(vars.ANSYS_VERSIONS_RETRO) }} + - ${{ fromJson(vars.ANSYS_VERSION_LAST_RELEASED) }} uses: ./.github/workflows/tests.yml with: - ANSYS_VERSION: ${{ matrix.dpf.version }} + ANSYS_VERSION: ${{ matrix.version }} python_versions: '["3.10"]' DOCSTRING: false - standalone_suffix: ${{ matrix.dpf.standalone-suffix }} + standalone_suffix: ${{ matrix.version == '241' && '.sp01' || '' }} secrets: inherit sync-main-with-master: diff --git a/.github/workflows/ci_release.yml b/.github/workflows/ci_release.yml index 333616280e..af4e2e266a 100644 --- a/.github/workflows/ci_release.yml +++ b/.github/workflows/ci_release.yml @@ -126,43 +126,40 @@ jobs: secrets: inherit tests-retro: - name: "Test DPF ${{ matrix.dpf.version }} compatibility" + name: "Test DPF ${{ matrix.version }} compatibility" 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": ""} + version: + - ${{ fromJson(vars.ANSYS_VERSIONS_RETRO) }} uses: ./.github/workflows/tests.yml with: - ANSYS_VERSION: ${{ matrix.dpf.version }} + ANSYS_VERSION: ${{ matrix.version }} python_versions: '["3.10"]' DOCSTRING: false - standalone_suffix: ${{ matrix.dpf.standalone-suffix }} + standalone_suffix: ${{ matrix.version == '241' && '.sp01' || '' }} secrets: inherit tests-pydpf-post: - name: "Test PyDPF-Post with ${{ matrix.dpf.version}}" + name: "Test PyDPF-Post with ${{ matrix.version}}" strategy: fail-fast: false matrix: - dpf: - - {"version": "252", "standalone-suffix": "${{ github.event.inputs.standalone_branch_suffix || '' }}", "test_docstrings": "true"} - - {"version": "251", "standalone-suffix": "", "test_docstrings": "false"} - - {"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"} + version: + - ${{ fromJson(vars.ANSYS_VERSIONS_RETRO) }} + standalone_suffix: + - "" + test_docstrings: + - "false" + include: + - version: ${{ vars.ANSYS_VERSION_LAST_RELEASED }} + standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }} + test_docstrings": "true" uses: ./.github/workflows/pydpf-post.yml with: - ANSYS_VERSION: ${{ matrix.dpf.version }} - standalone_suffix: ${{ matrix.dpf.standalone-suffix }} - test_docstrings: ${{ matrix.dpf.test_docstrings }} + ANSYS_VERSION: ${{ matrix.version }} + standalone_suffix: ${{ matrix.version == '241' && '.sp01' || matrix.standalone_suffix }} + test_docstrings: ${{ matrix.test_docstrings }} secrets: inherit docker_tests: