Skip to content

Commit 9b842f4

Browse files
PProfizicbellot000anslpa
authored
Update the pipelines for DPF 2023.2.pre0 (#608)
- Bump ANSYS_VERSION and default to DPF Server 23.2.pre0 - Update the CI to work with DPF Server 23.2.pre0 - Switch to pydpf-actions 2.3 - Use nick-fields/retry action to rerun failed steps - Add a "pip list" step to all testing jobs for easier debugging Signed-off-by: paul.profizi <[email protected]> Co-authored-by: cbellot <[email protected]> Co-authored-by: anslpa <[email protected]>
1 parent 0f3e681 commit 9b842f4

40 files changed

+835
-464
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ concurrency:
1616
env:
1717
PACKAGE_NAME: ansys-dpf-core
1818
MODULE: core
19-
ANSYS_VERSION: 231
19+
ANSYS_VERSION: 232
2020
extra: "--find-links .github/"
2121

2222
jobs:
@@ -55,7 +55,7 @@ jobs:
5555
tests:
5656
uses: ./.github/workflows/tests.yml
5757
with:
58-
ANSYS_VERSION: "231"
58+
ANSYS_VERSION: "232"
5959
python_versions: '["3.8"]'
6060
wheel: true
6161
wheelhouse: false
@@ -70,15 +70,25 @@ jobs:
7070
if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft
7171
uses: ./.github/workflows/docs.yml
7272
with:
73-
ANSYS_VERSION: "231"
73+
ANSYS_VERSION: "232"
7474
secrets: inherit
7575

7676
examples:
7777
if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft
7878
uses: ./.github/workflows/examples.yml
79+
with:
80+
ANSYS_VERSION: "232"
81+
python_versions: '["3.8"]'
82+
secrets: inherit
83+
84+
retro_231:
85+
name: "retro 231"
86+
if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft
87+
uses: ./.github/workflows/tests.yml
7988
with:
8089
ANSYS_VERSION: "231"
8190
python_versions: '["3.8"]'
91+
DOCSTRING: false
8292
secrets: inherit
8393

8494
retro_222:
@@ -106,6 +116,6 @@ jobs:
106116
if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft
107117
uses: ./.github/workflows/pydpf-post.yml
108118
with:
109-
ANSYS_VERSION: "231"
119+
ANSYS_VERSION: "232"
110120
secrets: inherit
111121

‎.github/workflows/ci_release.yml‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ concurrency:
2424
env:
2525
PACKAGE_NAME: ansys-dpf-core
2626
MODULE: core
27-
ANSYS_VERSION: 231
27+
ANSYS_VERSION: 232
2828
extra: "--find-links .github/"
2929

3030
jobs:
@@ -63,7 +63,7 @@ jobs:
6363
tests:
6464
uses: ./.github/workflows/tests.yml
6565
with:
66-
ANSYS_VERSION: "231"
66+
ANSYS_VERSION: "232"
6767
python_versions: '["3.7", "3.8", "3.9", "3.10"]'
6868
wheel: true
6969
wheelhouse: true
@@ -72,16 +72,25 @@ jobs:
7272
docs:
7373
uses: ./.github/workflows/docs.yml
7474
with:
75-
ANSYS_VERSION: "231"
75+
ANSYS_VERSION: "232"
7676
secrets: inherit
7777

7878
examples:
7979
uses: ./.github/workflows/examples.yml
8080
with:
81-
ANSYS_VERSION: "231"
81+
ANSYS_VERSION: "232"
8282
python_versions: '["3.7", "3.8", "3.9", "3.10"]'
8383
secrets: inherit
8484

85+
retro_231:
86+
name: "retro 231"
87+
uses: ./.github/workflows/tests.yml
88+
with:
89+
ANSYS_VERSION: "231"
90+
python_versions: '["3.8"]'
91+
DOCSTRING: false
92+
secrets: inherit
93+
8594
retro_222:
8695
name: "retro 222"
8796
uses: ./.github/workflows/tests.yml
@@ -100,6 +109,13 @@ jobs:
100109
DOCSTRING: false
101110
secrets: inherit
102111

112+
pydpf-post_232:
113+
name: "PyDPF-Post with 232"
114+
uses: ./.github/workflows/pydpf-post.yml
115+
with:
116+
ANSYS_VERSION: "232"
117+
secrets: inherit
118+
103119
pydpf-post_231:
104120
name: "PyDPF-Post with 231"
105121
uses: ./.github/workflows/pydpf-post.yml

‎.github/workflows/docs.yml‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
ANSYS_VERSION:
1212
required: false
1313
type: string
14-
default: "231"
14+
default: "232"
1515
secrets:
1616
DPF_PIPELINE:
1717
required: true
@@ -27,7 +27,7 @@ on:
2727
description: "ANSYS version"
2828
required: true
2929
type: string
30-
default: "231"
30+
default: "232"
3131

3232
env:
3333
PACKAGE_NAME: ansys-dpf-core
@@ -42,14 +42,22 @@ jobs:
4242
steps:
4343
- uses: actions/checkout@v3
4444

45+
- name: "Set licensing if necessary"
46+
if: inputs.ANSYS_VERSION > 231
47+
shell: bash
48+
run: |
49+
echo "ANSYS_DPF_ACCEPT_LA=Y" >> $GITHUB_ENV
50+
echo "ANSYSLMD_LICENSE_FILE=1055@${{ secrets.LICENSE_SERVER }}" >> $GITHUB_ENV
51+
echo "ANSYS_DPF_SERVER_CONTEXT=PREMIUM" >> $GITHUB_ENV
52+
4553
- name: Setup Python
4654
uses: actions/[email protected]
4755
with:
4856
python-version: ${{ inputs.python_version }}
4957

5058
- name: "Build Package"
5159
id: build-package
52-
uses: pyansys/pydpf-actions/build_package@v2.2
60+
uses: pyansys/pydpf-actions/build_package@v2.3
5361
with:
5462
python-version: ${{ inputs.python_version }}
5563
ANSYS_VERSION: ${{inputs.ANSYS_VERSION}}
@@ -76,7 +84,11 @@ jobs:
7684
pip install -r requirements/requirements_docs.txt
7785
7886
- name: "Kill all servers"
79-
uses: pyansys/pydpf-actions/[email protected]
87+
uses: pyansys/pydpf-actions/[email protected]
88+
89+
- name: "List installed packages"
90+
shell: bash
91+
run: pip list
8092

8193
- name: "Build HTML Documentation"
8294
shell: cmd
@@ -102,7 +114,7 @@ jobs:
102114
esac
103115
104116
- name: "Kill all servers"
105-
uses: pyansys/pydpf-actions/kill-dpf-servers@v2.2
117+
uses: pyansys/pydpf-actions/kill-dpf-servers@v2.3
106118
if: always()
107119

108120
- name: "Retrieve package version"

‎.github/workflows/examples.yml‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@ on:
1111
ANSYS_VERSION:
1212
required: false
1313
type: string
14-
default: "231"
15-
secrets:
16-
DPF_PIPELINE:
17-
required: true
14+
default: "232"
1815
# Can be called manually
1916
workflow_dispatch:
2017
inputs:
@@ -27,7 +24,7 @@ on:
2724
description: "ANSYS version to run."
2825
required: true
2926
type: string
30-
default: "231"
27+
default: "232"
3128

3229
env:
3330
PACKAGE_NAME: ansys-dpf-core
@@ -43,7 +40,7 @@ jobs:
4340
steps:
4441
- id: set_array
4542
run: |
46-
echo "python_versions=${{ inputs.python_versions }}" >> $GITHUB_OUTPUT
43+
echo "python_versions=${{ toJSON(inputs.python_versions) }}" >> $GITHUB_OUTPUT
4744
4845
examples:
4946
name: "Run Examples"
@@ -58,13 +55,20 @@ jobs:
5855
steps:
5956
- uses: actions/checkout@v3
6057

58+
- name: "Set licensing if necessary"
59+
if: inputs.ANSYS_VERSION > 231
60+
shell: bash
61+
run: |
62+
echo "ANSYS_DPF_ACCEPT_LA=Y" >> $GITHUB_ENV
63+
echo "ANSYSLMD_LICENSE_FILE=1055@${{ secrets.LICENSE_SERVER }}" >> $GITHUB_ENV
64+
6165
- name: Setup Python
6266
uses: actions/[email protected]
6367
with:
6468
python-version: ${{ matrix.python-version }}
6569

6670
- name: "Build Package"
67-
uses: pyansys/pydpf-actions/build_package@v2.2
71+
uses: pyansys/pydpf-actions/build_package@v2.3
6872
with:
6973
python-version: ${{ matrix.python-version }}
7074
ANSYS_VERSION: ${{inputs.ANSYS_VERSION}}
@@ -77,10 +81,14 @@ jobs:
7781
extra-pip-args: ${{ env.extra }}
7882

7983
- name: "Prepare Testing Environment"
80-
uses: pyansys/pydpf-actions/prepare_tests@v2.2
84+
uses: pyansys/pydpf-actions/prepare_tests@v2.3
8185
with:
8286
DEBUG: true
8387

88+
- name: "List installed packages"
89+
shell: bash
90+
run: pip list
91+
8492
- name: "Run examples"
8593
shell: bash
8694
working-directory: .ci
@@ -89,5 +97,5 @@ jobs:
8997
python run_examples.py
9098
9199
- name: "Kill all servers"
92-
uses: pyansys/pydpf-actions/kill-dpf-servers@v2.2
100+
uses: pyansys/pydpf-actions/kill-dpf-servers@v2.3
93101
if: always()

‎.github/workflows/gate.yml‎

Lines changed: 34 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
ANSYS_VERSION:
1212
required: false
1313
type: string
14-
default: "231"
14+
default: "232"
1515
# Can be called manually
1616
workflow_dispatch:
1717
inputs:
@@ -24,33 +24,51 @@ on:
2424
description: "ANSYS version"
2525
required: true
2626
type: string
27-
default: "231"
27+
default: "232"
2828

2929
env:
3030
PACKAGE_NAME: ansys-dpf-core
3131
MODULE: core
3232
extra: "--find-links .github/"
3333

3434
jobs:
35+
setup:
36+
name: "Setup"
37+
runs-on: ubuntu-latest
38+
outputs:
39+
python_versions: ${{ steps.set_array.outputs.python_versions }}
40+
steps:
41+
- id: set_array
42+
run: |
43+
echo "python_versions=${{ toJSON(inputs.python_versions) }}" >> $GITHUB_OUTPUT
44+
3545
Gate:
3646
name: "Gate"
47+
needs: setup
3748
runs-on: ${{ matrix.os }}
3849
strategy:
3950
fail-fast: false
4051
matrix:
41-
python-version: ${{ inputs.python_versions }}
52+
python-version: ${{ fromJSON(needs.setup.outputs.python_versions) }}
4253
os: ["windows-latest", "ubuntu-latest"]
4354

4455
steps:
4556
- uses: actions/checkout@v3
4657

58+
- name: "Set licensing if necessary"
59+
if: inputs.ANSYS_VERSION > 231
60+
shell: bash
61+
run: |
62+
echo "ANSYS_DPF_ACCEPT_LA=Y" >> $GITHUB_ENV
63+
echo "ANSYSLMD_LICENSE_FILE=1055@${{ secrets.LICENSE_SERVER }}" >> $GITHUB_ENV
64+
4765
- name: Setup Python
4866
uses: actions/[email protected]
4967
with:
5068
python-version: ${{ matrix.python-version }}
5169

5270
- name: "Build Package"
53-
uses: pyansys/pydpf-actions/build_package@v2.2
71+
uses: pyansys/pydpf-actions/build_package@v2.3
5472
with:
5573
python-version: ${{ matrix.python-version }}
5674
ANSYS_VERSION: ${{inputs.ANSYS_VERSION}}
@@ -62,8 +80,14 @@ jobs:
6280
wheel: false
6381
extra-pip-args: ${{ env.extra }}
6482

65-
- name: "Setup headless display"
66-
uses: pyvista/setup-headless-display-action@v1
83+
- name: "Prepare Testing Environment"
84+
uses: pyansys/pydpf-actions/[email protected]
85+
with:
86+
DEBUG: true
87+
88+
- name: "List installed packages"
89+
shell: bash
90+
run: pip list
6791

6892
- name: "Check examples with gatebin"
6993
shell: bash
@@ -73,7 +97,7 @@ jobs:
7397
python run_examples.py
7498
7599
- name: "Kill all servers"
76-
uses: pyansys/pydpf-actions/kill-dpf-servers@v2.2
100+
uses: pyansys/pydpf-actions/kill-dpf-servers@v2.3
77101
if: always()
78102

79103
- name: "Uninstall gatebin"
@@ -92,7 +116,7 @@ jobs:
92116
if: always()
93117

94118
- name: "Kill all servers"
95-
uses: pyansys/pydpf-actions/kill-dpf-servers@v2.2
119+
uses: pyansys/pydpf-actions/kill-dpf-servers@v2.3
96120
if: always()
97121

98122
- name: "Check sanity without gatebin GRPC"
@@ -105,7 +129,7 @@ jobs:
105129
if: always()
106130

107131
- name: "Kill all servers"
108-
uses: pyansys/pydpf-actions/kill-dpf-servers@v2.2
132+
uses: pyansys/pydpf-actions/kill-dpf-servers@v2.3
109133
if: always()
110134

111135
- name: "Check sanity without gatebin LEGACYGRPC"
@@ -118,5 +142,5 @@ jobs:
118142
if: always()
119143

120144
- name: "Kill all servers"
121-
uses: pyansys/pydpf-actions/kill-dpf-servers@v2.2
145+
uses: pyansys/pydpf-actions/kill-dpf-servers@v2.3
122146
if: always()

0 commit comments

Comments
 (0)