Skip to content
Merged
15 changes: 7 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ on:
description: "ANSYS version"
required: false
type: string
default: vars.ANSYS_VERSION_DEFAULT
standalone_branch_suffix:
description: 'Suffix of the branch on standalone'
required: false
Expand Down Expand Up @@ -105,7 +104,7 @@ jobs:
uses: ./.github/workflows/tests.yml
needs: pick_server_suffix
with:
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}
ANSYS_VERSION: ${{ inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}
python_versions: '["3.10"]'
wheel: true
wheelhouse: false
Expand All @@ -116,7 +115,7 @@ jobs:
uses: ./.github/workflows/tests.yml
needs: pick_server_suffix
with:
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}
ANSYS_VERSION: ${{ inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}
python_versions: '["3.10"]'
wheel: true
wheelhouse: false
Expand All @@ -129,7 +128,7 @@ jobs:
uses: ./.github/workflows/test_docker.yml
needs: pick_server_suffix
with:
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}
ANSYS_VERSION: ${{ inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}
standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}}
secrets: inherit

Expand All @@ -138,7 +137,7 @@ jobs:
uses: ./.github/workflows/examples_docker.yml
needs: pick_server_suffix
with:
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}
ANSYS_VERSION: ${{ inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}
python_versions: '["3.10"]'
standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}}
secrets: inherit
Expand All @@ -148,7 +147,7 @@ jobs:
uses: ./.github/workflows/docs.yml
needs: pick_server_suffix
with:
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}
ANSYS_VERSION: ${{ inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}
standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}}
event_name: ${{ github.event_name }}
python_version: "3.11"
Expand All @@ -174,7 +173,7 @@ jobs:
uses: ./.github/workflows/examples.yml
needs: pick_server_suffix
with:
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}
ANSYS_VERSION: ${{ inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}
python_versions: '["3.10"]'
standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}}
secrets: inherit
Expand All @@ -185,7 +184,7 @@ jobs:
uses: ./.github/workflows/pydpf-post.yml
needs: pick_server_suffix
with:
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}
ANSYS_VERSION: ${{ inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}
post_branch: "master"
standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}}
test_docstrings: "true"
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/ci_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
tests_3_10:
uses: ./.github/workflows/tests.yml
with:
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }}
ANSYS_VERSION: ${{ inputs.ansys_version || '251' }}
python_versions: '["3.10"]'
wheel: true
wheelhouse: true
Expand All @@ -86,7 +86,7 @@ jobs:
tests:
uses: ./.github/workflows/tests.yml
with:
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }}
ANSYS_VERSION: ${{ inputs.ansys_version || '251' }}
python_versions: '["3.11", "3.12"]'
DOCSTRING: false
wheel: false
Expand All @@ -97,7 +97,7 @@ jobs:
tests_any_3_10:
uses: ./.github/workflows/tests.yml
with:
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }}
ANSYS_VERSION: ${{ inputs.ansys_version || '251' }}
python_versions: '["3.10"]'
wheel: true
wheelhouse: false
Expand All @@ -108,7 +108,7 @@ jobs:
tests_any:
uses: ./.github/workflows/tests.yml
with:
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }}
ANSYS_VERSION: ${{ inputs.ansys_version || '251' }}
python_versions: '["3.11", "3.12"]'
DOCSTRING: false
wheel: false
Expand All @@ -120,15 +120,15 @@ jobs:
docs:
uses: ./.github/workflows/docs.yml
with:
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }}
ANSYS_VERSION: ${{ inputs.ansys_version || '251' }}
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
event_name: ${{ github.event_name }}
secrets: inherit

examples:
uses: ./.github/workflows/examples.yml
with:
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }}
ANSYS_VERSION: ${{ inputs.ansys_version || '251' }}
python_versions: '["3.10", "3.11", "3.12"]'
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
secrets: inherit
Expand Down Expand Up @@ -183,7 +183,7 @@ jobs:
name: "PyDPF-Post with 251"
uses: ./.github/workflows/pydpf-post.yml
with:
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }}
ANSYS_VERSION: ${{ inputs.ansys_version || '251' }}
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
test_docstrings: "true"
secrets: inherit
Expand Down Expand Up @@ -227,15 +227,15 @@ jobs:
name: "Build and Test on Docker"
uses: ./.github/workflows/test_docker.yml
with:
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }}
ANSYS_VERSION: ${{ inputs.ansys_version || '251' }}
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
secrets: inherit

docker_examples:
name: "Run examples on Docker"
uses: ./.github/workflows/examples_docker.yml
with:
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }}
ANSYS_VERSION: ${{ inputs.ansys_version || '251' }}
python_versions: '["3.10", "3.11", "3.12"]'
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
secrets: inherit
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ on:
ANSYS_VERSION:
required: false
type: string
default: vars.ANSYS_VERSION_DEFAULT
standalone_suffix:
description: "Suffix of the branch on standalone"
required: false
Expand All @@ -32,9 +31,8 @@ on:
default: "3.11"
ANSYS_VERSION:
description: "ANSYS version"
required: true
required: false
type: string
default: vars.ANSYS_VERSION_DEFAULT
standalone_suffix:
description: "Suffix of the branch on standalone"
required: false
Expand All @@ -61,7 +59,7 @@ jobs:
- uses: actions/checkout@v4

- name: "Set licensing if necessary"
if: inputs.ANSYS_VERSION > 231
if: ${{ (inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT) > '231' }}
shell: bash
run: |
echo "ANSYS_DPF_ACCEPT_LA=Y" >> $GITHUB_ENV
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ on:
ANSYS_VERSION:
required: false
type: string
default: vars.ANSYS_VERSION_DEFAULT
standalone_suffix:
description: "Suffix of the branch on standalone"
required: false
Expand All @@ -27,9 +26,8 @@ on:
default: '["3.10"]'
ANSYS_VERSION:
description: "ANSYS version to run."
required: true
required: false
type: string
default: vars.ANSYS_VERSION_DEFAULT
standalone_suffix:
description: "Suffix of the branch on standalone"
required: false
Expand Down Expand Up @@ -65,7 +63,7 @@ jobs:
- uses: actions/checkout@v4

- name: "Set licensing if necessary"
if: inputs.ANSYS_VERSION > 231
if: ${{ (inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT) > '231' }}
shell: bash
run: |
echo "ANSYS_DPF_ACCEPT_LA=Y" >> $GITHUB_ENV
Expand Down Expand Up @@ -109,7 +107,7 @@ jobs:
with:
dpf-standalone-TOKEN: ${{secrets.DPF_PIPELINE}}
standalone_suffix: ${{ inputs.standalone_suffix }}
ANSYS_VERSION : ${{inputs.ANSYS_VERSION}}
ANSYS_VERSION : ${{ inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}

- name: "Check licences of packages"
uses: ansys/pydpf-actions/[email protected]
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/examples_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ on:
ANSYS_VERSION:
required: false
type: string
default: vars.ANSYS_VERSION_DEFAULT
standalone_suffix:
description: "Suffix of the branch on standalone"
required: false
Expand All @@ -27,9 +26,8 @@ on:
default: '["3.10"]'
ANSYS_VERSION:
description: "ANSYS version to run."
required: true
required: false
type: string
default: vars.ANSYS_VERSION_DEFAULT
standalone_suffix:
description: "Suffix of the branch on standalone"
required: false
Expand Down Expand Up @@ -105,7 +103,7 @@ jobs:
with:
dpf-standalone-TOKEN: ${{secrets.DPF_PIPELINE}}
standalone_suffix: ${{ inputs.standalone_suffix }}
ANSYS_VERSION : ${{inputs.ANSYS_VERSION}}
ANSYS_VERSION : ${{ inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}

- name: "Check licences of packages"
uses: ansys/pydpf-actions/[email protected]
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/pydpf-post.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ on:
ANSYS_VERSION:
required: false
type: string
default: vars.ANSYS_VERSION_DEFAULT
standalone_suffix:
description: "Suffix of the branch on standalone"
required: false
Expand All @@ -30,9 +29,8 @@ on:
type: string
ANSYS_VERSION:
description: "ANSYS version"
required: true
required: false
type: string
default: vars.ANSYS_VERSION_DEFAULT
standalone_suffix:
description: "Suffix of the branch on standalone"
required: false
Expand Down Expand Up @@ -62,7 +60,7 @@ jobs:
- uses: actions/checkout@v4

- name: "Set licensing if necessary"
if: inputs.ANSYS_VERSION > 231
if: ${{ (inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT) > '231' }}
shell: bash
run: |
echo "ANSYS_DPF_ACCEPT_LA=Y" >> $GITHUB_ENV
Expand Down Expand Up @@ -106,7 +104,7 @@ jobs:
with:
dpf-standalone-TOKEN: ${{secrets.DPF_PIPELINE}}
standalone_suffix: ${{ inputs.standalone_suffix }}
ANSYS_VERSION : ${{inputs.ANSYS_VERSION}}
ANSYS_VERSION : ${{ inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}

- name: "Check licences of packages"
uses: ansys/pydpf-actions/[email protected]
Expand Down
16 changes: 7 additions & 9 deletions .github/workflows/test_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ on:
ANSYS_VERSION:
required: false
type: string
default: vars.ANSYS_VERSION_DEFAULT
# Can be called manually
workflow_dispatch:
inputs:
Expand All @@ -23,9 +22,8 @@ on:
default: ''
ANSYS_VERSION:
description: "ANSYS version to run."
required: true
required: false
type: string
default: vars.ANSYS_VERSION_DEFAULT

env:
PACKAGE_NAME: ansys-dpf-core
Expand Down Expand Up @@ -87,7 +85,7 @@ jobs:
with:
dpf-standalone-TOKEN: ${{secrets.DPF_PIPELINE}}
standalone_suffix: ${{ inputs.standalone_suffix }}
ANSYS_VERSION : ${{inputs.ANSYS_VERSION}}
ANSYS_VERSION : ${{ inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}

- name: "Check licences of packages"
uses: ansys/pydpf-actions/[email protected]
Expand Down Expand Up @@ -219,21 +217,21 @@ jobs:
- name: "Upload Test Results"
uses: actions/upload-artifact@v4
with:
name: ${{ env.PACKAGE_NAME }}_${{ matrix.python-version }}_${{ matrix.os }}_pytest_${{ inputs.ANSYS_VERSION }}_docker
name: ${{ env.PACKAGE_NAME }}_${{ matrix.python-version }}_${{ matrix.os }}_pytest_${{ inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}_docker
path: tests/junit/test-results.xml
timeout-minutes: 5

- name: "Upload coverage to Codecov"
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }} # required
name: ${{ env.PACKAGE_NAME }}_${{ matrix.python-version }}_${{ matrix.os }}_pytest_${{ inputs.ANSYS_VERSION }}_docker.xml
flags: docker,${{ inputs.ANSYS_VERSION }},${{ matrix.os }},${{ matrix.python-version }}
name: ${{ env.PACKAGE_NAME }}_${{ matrix.python-version }}_${{ matrix.os }}_pytest_${{ inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}_docker.xml
flags: docker,${{ inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }},${{ matrix.os }},${{ matrix.python-version }}

- name: "Upload test analytics results to Codecov"
if: ${{ !cancelled() }}
uses: codecov/test-results-action@v1
with:
token: ${{ secrets.CODECOV_TOKEN }}
name: test_results_${{ env.PACKAGE_NAME }}_${{ matrix.python-version }}_${{ matrix.os }}_${{ inputs.ANSYS_VERSION }}${{ inputs.test_any == 'true' && '_any' || '' }}
flags: ${{ inputs.ANSYS_VERSION }},${{ matrix.os }},${{ matrix.python-version }}${{ inputs.test_any == 'true' && ',any' || '' }}
name: test_results_${{ env.PACKAGE_NAME }}_${{ matrix.python-version }}_${{ matrix.os }}_${{ inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}${{ inputs.test_any == 'true' && '_any' || '' }}
flags: ${{ inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }},${{ matrix.os }},${{ matrix.python-version }}${{ inputs.test_any == 'true' && ',any' || '' }}
Loading
Loading