Skip to content

Commit 9d1928e

Browse files
PProfiziPProfizi
authored
Switch CI to 241 (#979)
* Switch to 241 as main testing version. Remove retro 221 * Do not remove 221 retro tests yet * Update requirements_dev.txt * Update retro_232 * Add time-out on Docker examples job
1 parent 5b57464 commit 9d1928e

File tree

11 files changed

+73
-36
lines changed

11 files changed

+73
-36
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ on:
2323
description: "extra pip --find-links argument to find custom dpf wheels"
2424
required: false
2525
type: string
26-
default: './dpf-standalone/v232/dist'
26+
default: './dpf-standalone/v241/dist'
2727
custom-wheels-docker:
2828
description: "extra pip --find-links argument to find custom dpf wheels"
2929
required: false
@@ -36,7 +36,6 @@ concurrency:
3636
cancel-in-progress: true
3737

3838
env:
39-
ANSYS_VERSION: 232
4039
DOCUMENTATION_CNAME: 'dpf.docs.pyansys.com'
4140
MAIN_PYTHON_VERSION: '3.8'
4241

@@ -69,19 +68,20 @@ jobs:
6968
tests:
7069
uses: ./.github/workflows/tests.yml
7170
with:
72-
ANSYS_VERSION: "232"
71+
ANSYS_VERSION: "241"
7372
python_versions: '["3.8"]'
7473
wheel: true
7574
wheelhouse: false
7675
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
7776
custom-requirements: ${{ github.event.inputs.custom-requirements || 'requirements/requirements_dev.txt' }}
78-
custom-wheels: ${{ github.event.inputs.custom-wheels || './dpf-standalone/v232/dist' }}
77+
custom-wheels: ${{ github.event.inputs.custom-wheels || './dpf-standalone/v241/dist' }}
7978
secrets: inherit
8079

8180
docker_tests:
8281
name: "Build and Test on Docker"
8382
uses: ./.github/workflows/test_docker.yml
8483
with:
84+
ANSYS_VERSION: "241"
8585
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
8686
custom-requirements: ${{ github.event.inputs.custom-requirements || 'requirements/requirements_dev.txt' }}
8787
custom-wheels: ${{ github.event.inputs.custom-wheels-docker || './dpf-standalone/dist' }}
@@ -91,7 +91,7 @@ jobs:
9191
name: "Run examples on Docker"
9292
uses: ./.github/workflows/examples_docker.yml
9393
with:
94-
ANSYS_VERSION: "232"
94+
ANSYS_VERSION: "241"
9595
python_versions: '["3.8"]'
9696
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
9797
custom-requirements: ${{ github.event.inputs.custom-requirements || 'requirements/requirements_dev.txt' }}
@@ -102,10 +102,10 @@ jobs:
102102
if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft
103103
uses: ./.github/workflows/docs.yml
104104
with:
105-
ANSYS_VERSION: "232"
105+
ANSYS_VERSION: "241"
106106
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
107107
custom-requirements: ${{ github.event.inputs.custom-requirements || 'requirements/requirements_dev.txt' }}
108-
custom-wheels: ${{ github.event.inputs.custom-wheels || './dpf-standalone/v232/dist' }}
108+
custom-wheels: ${{ github.event.inputs.custom-wheels || './dpf-standalone/v241/dist' }}
109109
event_name: ${{ github.event_name }}
110110
secrets: inherit
111111

@@ -125,11 +125,23 @@ jobs:
125125
if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft
126126
uses: ./.github/workflows/examples.yml
127127
with:
128-
ANSYS_VERSION: "232"
128+
ANSYS_VERSION: "241"
129129
python_versions: '["3.8"]'
130130
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
131131
custom-requirements: ${{ github.event.inputs.custom-requirements || 'requirements/requirements_dev.txt' }}
132-
custom-wheels: ${{ github.event.inputs.custom-wheels || './dpf-standalone/v232/dist' }}
132+
custom-wheels: ${{ github.event.inputs.custom-wheels || './dpf-standalone/v241/dist' }}
133+
secrets: inherit
134+
135+
retro_232:
136+
name: "retro 232"
137+
if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft
138+
uses: ./.github/workflows/tests.yml
139+
with:
140+
ANSYS_VERSION: "232"
141+
python_versions: '["3.8"]'
142+
DOCSTRING: false
143+
standalone_suffix: ''
144+
custom-wheels: ${{ github.event.inputs.custom-wheels || './dpf-standalone/v232/dist --pre' }}
133145
secrets: inherit
134146

135147
retro_231:
@@ -170,9 +182,9 @@ jobs:
170182
if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft
171183
uses: ./.github/workflows/pydpf-post.yml
172184
with:
173-
ANSYS_VERSION: "232"
185+
ANSYS_VERSION: "241"
174186
post_branch: "master"
175187
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
176188
custom-requirements: ${{ github.event.inputs.custom-requirements || 'requirements/requirements_dev.txt' }}
177-
custom-wheels: ${{ github.event.inputs.custom-wheels || './dpf-standalone/v232/dist' }}
189+
custom-wheels: ${{ github.event.inputs.custom-wheels || './dpf-standalone/v241/dist' }}
178190
secrets: inherit

‎.github/workflows/ci_release.yml‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ on:
2424
#* * * * *
2525

2626
env:
27-
ANSYS_VERSION: 232
2827
DOCUMENTATION_CNAME: 'dpf.docs.pyansys.com'
2928
MAIN_PYTHON_VERSION: '3.8'
3029

@@ -57,7 +56,7 @@ jobs:
5756
tests:
5857
uses: ./.github/workflows/tests.yml
5958
with:
60-
ANSYS_VERSION: "232"
59+
ANSYS_VERSION: "241"
6160
python_versions: '["3.7", "3.8", "3.9", "3.10"]'
6261
wheel: true
6362
wheelhouse: true
@@ -67,19 +66,28 @@ jobs:
6766
docs:
6867
uses: ./.github/workflows/docs.yml
6968
with:
70-
ANSYS_VERSION: "232"
69+
ANSYS_VERSION: "241"
7170
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre1' }}
7271
event_name: ${{ github.event_name }}
7372
secrets: inherit
7473

7574
examples:
7675
uses: ./.github/workflows/examples.yml
7776
with:
78-
ANSYS_VERSION: "232"
77+
ANSYS_VERSION: "241"
7978
python_versions: '["3.7", "3.8", "3.9", "3.10"]'
8079
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '.pre1' }}
8180
secrets: inherit
8281

82+
retro_232:
83+
name: "retro 232"
84+
uses: ./.github/workflows/tests.yml
85+
with:
86+
ANSYS_VERSION: "232"
87+
python_versions: '["3.8"]'
88+
DOCSTRING: false
89+
secrets: inherit
90+
8391
retro_231:
8492
name: "retro 231"
8593
uses: ./.github/workflows/tests.yml
@@ -107,6 +115,14 @@ jobs:
107115
DOCSTRING: false
108116
secrets: inherit
109117

118+
pydpf-post_241:
119+
name: "PyDPF-Post with 241"
120+
uses: ./.github/workflows/pydpf-post.yml
121+
with:
122+
ANSYS_VERSION: "241"
123+
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
124+
secrets: inherit
125+
110126
pydpf-post_232:
111127
name: "PyDPF-Post with 232"
112128
uses: ./.github/workflows/pydpf-post.yml

‎.github/workflows/docs.yml‎

Lines changed: 2 additions & 2 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: "232"
14+
default: "241"
1515
standalone_suffix:
1616
description: "Suffix of the branch on standalone"
1717
required: false
@@ -44,7 +44,7 @@ on:
4444
description: "ANSYS version"
4545
required: true
4646
type: string
47-
default: "232"
47+
default: "241"
4848
standalone_suffix:
4949
description: "Suffix of the branch on standalone"
5050
required: false

‎.github/workflows/examples.yml‎

Lines changed: 2 additions & 2 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: "232"
14+
default: "241"
1515
standalone_suffix:
1616
description: "Suffix of the branch on standalone"
1717
required: false
@@ -39,7 +39,7 @@ on:
3939
description: "ANSYS version to run."
4040
required: true
4141
type: string
42-
default: "232"
42+
default: "241"
4343
standalone_suffix:
4444
description: "Suffix of the branch on standalone"
4545
required: false

‎.github/workflows/examples_docker.yml‎

Lines changed: 3 additions & 2 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: "232"
14+
default: "241"
1515
standalone_suffix:
1616
description: "Suffix of the branch on standalone"
1717
required: false
@@ -39,7 +39,7 @@ on:
3939
description: "ANSYS version to run."
4040
required: true
4141
type: string
42-
default: "232"
42+
default: "241"
4343
standalone_suffix:
4444
description: "Suffix of the branch on standalone"
4545
required: false
@@ -77,6 +77,7 @@ jobs:
7777
name: "Run Examples"
7878
needs: setup
7979
runs-on: ${{ matrix.os }}
80+
timeout-minutes: 40
8081
strategy:
8182
fail-fast: false
8283
matrix:

‎.github/workflows/gate.yml‎

Lines changed: 2 additions & 2 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: "232"
14+
default: "241"
1515
standalone_suffix:
1616
description: "Suffix of the branch on standalone"
1717
required: false
@@ -29,7 +29,7 @@ on:
2929
description: "ANSYS version"
3030
required: true
3131
type: string
32-
default: "232"
32+
default: "241"
3333
standalone_suffix:
3434
description: "Suffix of the branch on standalone"
3535
required: false

‎.github/workflows/pydpf-post.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
ANSYS_VERSION:
1111
required: false
1212
type: string
13-
default: "232"
13+
default: "241"
1414
standalone_suffix:
1515
description: "Suffix of the branch on standalone"
1616
required: false
@@ -37,7 +37,7 @@ on:
3737
description: "ANSYS version"
3838
required: true
3939
type: string
40-
default: "232"
40+
default: "241"
4141
standalone_suffix:
4242
description: "Suffix of the branch on standalone"
4343
required: false

‎.github/workflows/test_docker.yml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ on:
99
required: false
1010
type: string
1111
default: ''
12+
ANSYS_VERSION:
13+
required: false
14+
type: string
15+
default: "241"
1216
custom-requirements:
1317
description: "Path to requirements.txt file to install"
1418
required: false
@@ -27,6 +31,11 @@ on:
2731
required: false
2832
type: string
2933
default: ''
34+
ANSYS_VERSION:
35+
description: "ANSYS version to run."
36+
required: true
37+
type: string
38+
default: "241"
3039
custom-requirements:
3140
description: "Path to requirements.txt file to install"
3241
required: false
@@ -41,7 +50,6 @@ on:
4150
env:
4251
PACKAGE_NAME: ansys-dpf-core
4352
MODULE: core
44-
ANSYS_VERSION: 232
4553
ANSYS_DPF_ACCEPT_LA: Y
4654
ANSYSLMD_LICENSE_FILE: 1055@${{secrets.LICENSE_SERVER}}
4755

@@ -61,7 +69,7 @@ jobs:
6169
uses: ansys/pydpf-actions/[email protected]
6270
with:
6371
python-version: ${{ matrix.python-version }}
64-
ANSYS_VERSION: ${{env.ANSYS_VERSION}}
72+
ANSYS_VERSION: ${{inputs.ANSYS_VERSION}}
6573
PACKAGE_NAME: ${{env.PACKAGE_NAME}}
6674
MODULE: ${{env.MODULE}}
6775
dpf-standalone-TOKEN: ${{secrets.DPF_PIPELINE}}
@@ -185,7 +193,7 @@ jobs:
185193
- name: "Upload Test Results"
186194
uses: actions/upload-artifact@v3
187195
with:
188-
name: ${{ env.PACKAGE_NAME }}_${{ matrix.python-version }}_${{ matrix.os }}_pytest_${{ env.ANSYS_VERSION }}_docker
196+
name: ${{ env.PACKAGE_NAME }}_${{ matrix.python-version }}_${{ matrix.os }}_pytest_${{ inputs.ANSYS_VERSION }}_docker
189197
path: tests/junit/test-results.xml
190198
timeout-minutes: 5
191199

‎.github/workflows/tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
ANSYS_VERSION:
1212
required: false
1313
type: string
14-
default: "232"
14+
default: "241"
1515
wheel:
1616
required: false
1717
type: string

‎.github/workflows/update_operators.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
description: "ANSYS version"
99
required: false
1010
type: string
11-
default: "232"
11+
default: "241"
1212
standalone_suffix:
1313
description: "Suffix of the branch on standalone"
1414
required: false
@@ -40,7 +40,7 @@ jobs:
4040
with:
4141
dpf-standalone-TOKEN: ${{secrets.DPF_PIPELINE}}
4242
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
43-
ANSYS_VERSION : ${{ github.event.inputs.ANSYS_VERSION || '232' }}
43+
ANSYS_VERSION : ${{ github.event.inputs.ANSYS_VERSION || '241' }}
4444

4545
- name: "Install local package as editable"
4646
shell: bash
@@ -82,9 +82,9 @@ jobs:
8282
src/ansys/dpf/core/operators/*
8383
docs/source/_static/dpf_operators.html
8484
commit-message: update operators
85-
title: Update Operators for DPF ${{ github.event.inputs.ANSYS_VERSION || '232' }}${{ github.event.inputs.standalone_branch_suffix || '' }} on ${{ github.ref_name }}
85+
title: Update Operators for DPF ${{ github.event.inputs.ANSYS_VERSION || '241' }}${{ github.event.inputs.standalone_branch_suffix || '' }} on ${{ github.ref_name }}
8686
body: An update of operators has been triggered either manually or by an update in the dpf-standalone repository.
87-
branch: maint/update_operators_for_${{ github.event.inputs.ANSYS_VERSION || '232' }}${{ github.event.inputs.standalone_branch_suffix || '' }}_on_${{ github.ref_name }}
87+
branch: maint/update_operators_for_${{ github.event.inputs.ANSYS_VERSION || '241' }}${{ github.event.inputs.standalone_branch_suffix || '' }}_on_${{ github.ref_name }}
8888
labels: maintenance
8989

9090
- name: "Kill all servers"

0 commit comments

Comments
 (0)