Skip to content

Commit 64ff9a8

Browse files
PProfiziPProfizi
authored
Move CI to 26R1 (#2299)
* Move CI to 26R1 * Update docs.yml * Update examples.yml * Update examples_docker.yml * Update pydpf-post.yml * Update test_docker.yml * Update tests.yml * Update update_operators.yml * Update update_operators.yml * Use repository variable ANSY_VERSION_DEFAULT in CI (#2300) * Update ci.yml * Update docs.yml * Update examples.yml * Update examples_docker.yml * Update pydpf-post.yml * Update test_docker.yml * Update tests.yml * Update update_operators.yml
1 parent 88657eb commit 64ff9a8

File tree

8 files changed

+46
-36
lines changed

8 files changed

+46
-36
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 30 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
description: "ANSYS version"
1515
required: false
1616
type: string
17-
default: "252"
17+
default: vars.ANSYS_VERSION_DEFAULT
1818
standalone_branch_suffix:
1919
description: 'Suffix of the branch on standalone'
2020
required: false
@@ -105,7 +105,7 @@ jobs:
105105
uses: ./.github/workflows/tests.yml
106106
needs: pick_server_suffix
107107
with:
108-
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '252' }}
108+
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}
109109
python_versions: '["3.10"]'
110110
wheel: true
111111
wheelhouse: false
@@ -116,7 +116,7 @@ jobs:
116116
uses: ./.github/workflows/tests.yml
117117
needs: pick_server_suffix
118118
with:
119-
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '252' }}
119+
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}
120120
python_versions: '["3.10"]'
121121
wheel: true
122122
wheelhouse: false
@@ -129,7 +129,7 @@ jobs:
129129
uses: ./.github/workflows/test_docker.yml
130130
needs: pick_server_suffix
131131
with:
132-
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '252' }}
132+
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}
133133
standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}}
134134
secrets: inherit
135135

@@ -138,7 +138,7 @@ jobs:
138138
uses: ./.github/workflows/examples_docker.yml
139139
needs: pick_server_suffix
140140
with:
141-
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '252' }}
141+
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}
142142
python_versions: '["3.10"]'
143143
standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}}
144144
secrets: inherit
@@ -148,7 +148,7 @@ jobs:
148148
uses: ./.github/workflows/docs.yml
149149
needs: pick_server_suffix
150150
with:
151-
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '252' }}
151+
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}
152152
standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}}
153153
event_name: ${{ github.event_name }}
154154
python_version: "3.11"
@@ -174,11 +174,34 @@ jobs:
174174
uses: ./.github/workflows/examples.yml
175175
needs: pick_server_suffix
176176
with:
177-
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '252' }}
177+
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}
178178
python_versions: '["3.10"]'
179179
standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}}
180180
secrets: inherit
181181

182+
pydpf-post:
183+
name: "PyDPF-Post"
184+
if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft
185+
uses: ./.github/workflows/pydpf-post.yml
186+
needs: pick_server_suffix
187+
with:
188+
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}
189+
post_branch: "master"
190+
standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}}
191+
test_docstrings: "true"
192+
secrets: inherit
193+
194+
retro_252:
195+
name: "retro 252"
196+
if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft
197+
uses: ./.github/workflows/tests.yml
198+
with:
199+
ANSYS_VERSION: "252"
200+
python_versions: '["3.10"]'
201+
DOCSTRING: false
202+
standalone_suffix: ''
203+
secrets: inherit
204+
182205
retro_251:
183206
name: "retro 251"
184207
if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft
@@ -242,15 +265,3 @@ jobs:
242265
python_versions: '["3.10"]'
243266
DOCSTRING: false
244267
secrets: inherit
245-
246-
pydpf-post:
247-
name: "PyDPF-Post"
248-
if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft
249-
uses: ./.github/workflows/pydpf-post.yml
250-
needs: pick_server_suffix
251-
with:
252-
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '252' }}
253-
post_branch: "master"
254-
standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}}
255-
test_docstrings: "true"
256-
secrets: inherit

‎.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: "251"
14+
default: vars.ANSYS_VERSION_DEFAULT
1515
standalone_suffix:
1616
description: "Suffix of the branch on standalone"
1717
required: false
@@ -34,7 +34,7 @@ on:
3434
description: "ANSYS version"
3535
required: true
3636
type: string
37-
default: "251"
37+
default: vars.ANSYS_VERSION_DEFAULT
3838
standalone_suffix:
3939
description: "Suffix of the branch on standalone"
4040
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: "251"
14+
default: vars.ANSYS_VERSION_DEFAULT
1515
standalone_suffix:
1616
description: "Suffix of the branch on standalone"
1717
required: false
@@ -29,7 +29,7 @@ on:
2929
description: "ANSYS version to run."
3030
required: true
3131
type: string
32-
default: "251"
32+
default: vars.ANSYS_VERSION_DEFAULT
3333
standalone_suffix:
3434
description: "Suffix of the branch on standalone"
3535
required: false

‎.github/workflows/examples_docker.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: "251"
14+
default: vars.ANSYS_VERSION_DEFAULT
1515
standalone_suffix:
1616
description: "Suffix of the branch on standalone"
1717
required: false
@@ -29,7 +29,7 @@ on:
2929
description: "ANSYS version to run."
3030
required: true
3131
type: string
32-
default: "251"
32+
default: vars.ANSYS_VERSION_DEFAULT
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: "251"
13+
default: vars.ANSYS_VERSION_DEFAULT
1414
standalone_suffix:
1515
description: "Suffix of the branch on standalone"
1616
required: false
@@ -32,7 +32,7 @@ on:
3232
description: "ANSYS version"
3333
required: true
3434
type: string
35-
default: "251"
35+
default: vars.ANSYS_VERSION_DEFAULT
3636
standalone_suffix:
3737
description: "Suffix of the branch on standalone"
3838
required: false

‎.github/workflows/test_docker.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
ANSYS_VERSION:
1313
required: false
1414
type: string
15-
default: "251"
15+
default: vars.ANSYS_VERSION_DEFAULT
1616
# Can be called manually
1717
workflow_dispatch:
1818
inputs:
@@ -25,7 +25,7 @@ on:
2525
description: "ANSYS version to run."
2626
required: true
2727
type: string
28-
default: "251"
28+
default: vars.ANSYS_VERSION_DEFAULT
2929

3030
env:
3131
PACKAGE_NAME: ansys-dpf-core

‎.github/workflows/tests.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: "251"
14+
default: vars.ANSYS_VERSION_DEFAULT
1515
wheel:
1616
required: false
1717
type: string
@@ -46,7 +46,7 @@ on:
4646
description: "ANSYS version"
4747
required: true
4848
type: string
49-
default: "251"
49+
default: vars.ANSYS_VERSION_DEFAULT
5050
wheel:
5151
description: "Generate a wheel"
5252
required: false

‎.github/workflows/update_operators.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@ on:
99
required: false
1010
type: string
1111
default: ""
12-
1312
ANSYS_VERSION:
1413
description: "ANSYS version"
1514
required: false
1615
type: string
17-
default: "252"
16+
default: vars.ANSYS_VERSION_DEFAULT
1817
standalone_branch_suffix:
1918
description: "Suffix of the branch on standalone"
2019
required: false
@@ -49,7 +48,7 @@ jobs:
4948
with:
5049
dpf-standalone-TOKEN: ${{secrets.DPF_PIPELINE}}
5150
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
52-
ANSYS_VERSION : ${{ github.event.inputs.ANSYS_VERSION || '252' }}
51+
ANSYS_VERSION : ${{ github.event.inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}
5352

5453
- name: "Update ansys-grpc-dpf"
5554
shell: bash
@@ -133,9 +132,9 @@ jobs:
133132
src/ansys/dpf/core/operators/*
134133
doc/source/_static/dpf_operators.html
135134
commit-message: update generated code
136-
title: Update generated code for DPF ${{ github.event.inputs.ANSYS_VERSION || '252' }}${{ github.event.inputs.standalone_branch_suffix || '' }} on ${{ github.ref_name }}
135+
title: Update generated code for DPF ${{ github.event.inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}${{ github.event.inputs.standalone_branch_suffix || '' }} on ${{ github.ref_name }}
137136
body: An update of generated code has been triggered either manually or by an update in the dpf-standalone repository.
138-
branch: maint/update_code_for_${{ github.event.inputs.ANSYS_VERSION || '252' }}${{ github.event.inputs.standalone_branch_suffix || '' }}_on_${{ github.ref_name }}
137+
branch: maint/update_code_for_${{ github.event.inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}${{ github.event.inputs.standalone_branch_suffix || '' }}_on_${{ github.ref_name }}
139138
labels: server-sync
140139
token: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}
141140
reviewers: ${{ github.ref_name == 'master' && 'ansys/dpf_integration_proxies' || '' }}

0 commit comments

Comments
 (0)