Skip to content

Commit 9751ab1

Browse files
PProfiziPProfizi
committed
Fix use of ansys version input in all workflows
1 parent 024bad5 commit 9751ab1

File tree

8 files changed

+34
-34
lines changed

8 files changed

+34
-34
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
uses: ./.github/workflows/tests.yml
105105
needs: pick_server_suffix
106106
with:
107-
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}
107+
ANSYS_VERSION: ${{ inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}
108108
python_versions: '["3.10"]'
109109
wheel: true
110110
wheelhouse: false
@@ -115,7 +115,7 @@ jobs:
115115
uses: ./.github/workflows/tests.yml
116116
needs: pick_server_suffix
117117
with:
118-
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}
118+
ANSYS_VERSION: ${{ inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}
119119
python_versions: '["3.10"]'
120120
wheel: true
121121
wheelhouse: false
@@ -128,7 +128,7 @@ jobs:
128128
uses: ./.github/workflows/test_docker.yml
129129
needs: pick_server_suffix
130130
with:
131-
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}
131+
ANSYS_VERSION: ${{ inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}
132132
standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}}
133133
secrets: inherit
134134

@@ -137,7 +137,7 @@ jobs:
137137
uses: ./.github/workflows/examples_docker.yml
138138
needs: pick_server_suffix
139139
with:
140-
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}
140+
ANSYS_VERSION: ${{ inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}
141141
python_versions: '["3.10"]'
142142
standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}}
143143
secrets: inherit
@@ -147,7 +147,7 @@ jobs:
147147
uses: ./.github/workflows/docs.yml
148148
needs: pick_server_suffix
149149
with:
150-
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}
150+
ANSYS_VERSION: ${{ inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}
151151
standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}}
152152
event_name: ${{ github.event_name }}
153153
python_version: "3.11"
@@ -173,7 +173,7 @@ jobs:
173173
uses: ./.github/workflows/examples.yml
174174
needs: pick_server_suffix
175175
with:
176-
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}
176+
ANSYS_VERSION: ${{ inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}
177177
python_versions: '["3.10"]'
178178
standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}}
179179
secrets: inherit
@@ -184,7 +184,7 @@ jobs:
184184
uses: ./.github/workflows/pydpf-post.yml
185185
needs: pick_server_suffix
186186
with:
187-
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}
187+
ANSYS_VERSION: ${{ inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}
188188
post_branch: "master"
189189
standalone_suffix: ${{needs.pick_server_suffix.outputs.suffix}}
190190
test_docstrings: "true"

‎.github/workflows/ci_release.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
tests_3_10:
7777
uses: ./.github/workflows/tests.yml
7878
with:
79-
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }}
79+
ANSYS_VERSION: ${{ inputs.ansys_version || '251' }}
8080
python_versions: '["3.10"]'
8181
wheel: true
8282
wheelhouse: true
@@ -86,7 +86,7 @@ jobs:
8686
tests:
8787
uses: ./.github/workflows/tests.yml
8888
with:
89-
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }}
89+
ANSYS_VERSION: ${{ inputs.ansys_version || '251' }}
9090
python_versions: '["3.11", "3.12"]'
9191
DOCSTRING: false
9292
wheel: false
@@ -97,7 +97,7 @@ jobs:
9797
tests_any_3_10:
9898
uses: ./.github/workflows/tests.yml
9999
with:
100-
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }}
100+
ANSYS_VERSION: ${{ inputs.ansys_version || '251' }}
101101
python_versions: '["3.10"]'
102102
wheel: true
103103
wheelhouse: false
@@ -108,7 +108,7 @@ jobs:
108108
tests_any:
109109
uses: ./.github/workflows/tests.yml
110110
with:
111-
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }}
111+
ANSYS_VERSION: ${{ inputs.ansys_version || '251' }}
112112
python_versions: '["3.11", "3.12"]'
113113
DOCSTRING: false
114114
wheel: false
@@ -120,15 +120,15 @@ jobs:
120120
docs:
121121
uses: ./.github/workflows/docs.yml
122122
with:
123-
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }}
123+
ANSYS_VERSION: ${{ inputs.ansys_version || '251' }}
124124
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
125125
event_name: ${{ github.event_name }}
126126
secrets: inherit
127127

128128
examples:
129129
uses: ./.github/workflows/examples.yml
130130
with:
131-
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }}
131+
ANSYS_VERSION: ${{ inputs.ansys_version || '251' }}
132132
python_versions: '["3.10", "3.11", "3.12"]'
133133
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
134134
secrets: inherit
@@ -183,7 +183,7 @@ jobs:
183183
name: "PyDPF-Post with 251"
184184
uses: ./.github/workflows/pydpf-post.yml
185185
with:
186-
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }}
186+
ANSYS_VERSION: ${{ inputs.ansys_version || '251' }}
187187
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
188188
test_docstrings: "true"
189189
secrets: inherit
@@ -227,15 +227,15 @@ jobs:
227227
name: "Build and Test on Docker"
228228
uses: ./.github/workflows/test_docker.yml
229229
with:
230-
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }}
230+
ANSYS_VERSION: ${{ inputs.ansys_version || '251' }}
231231
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
232232
secrets: inherit
233233

234234
docker_examples:
235235
name: "Run examples on Docker"
236236
uses: ./.github/workflows/examples_docker.yml
237237
with:
238-
ANSYS_VERSION: ${{ github.event.inputs.ansys_version || '251' }}
238+
ANSYS_VERSION: ${{ inputs.ansys_version || '251' }}
239239
python_versions: '["3.10", "3.11", "3.12"]'
240240
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
241241
secrets: inherit

‎.github/workflows/docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
- uses: actions/checkout@v4
6060

6161
- name: "Set licensing if necessary"
62-
if: ${{ (github.event.inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT) > '231' }}
62+
if: ${{ (inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT) > '231' }}
6363
shell: bash
6464
run: |
6565
echo "ANSYS_DPF_ACCEPT_LA=Y" >> $GITHUB_ENV

‎.github/workflows/examples.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
- uses: actions/checkout@v4
6464

6565
- name: "Set licensing if necessary"
66-
if: ${{ (github.event.inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT) > '231' }}
66+
if: ${{ (inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT) > '231' }}
6767
shell: bash
6868
run: |
6969
echo "ANSYS_DPF_ACCEPT_LA=Y" >> $GITHUB_ENV

‎.github/workflows/examples_docker.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
with:
104104
dpf-standalone-TOKEN: ${{secrets.DPF_PIPELINE}}
105105
standalone_suffix: ${{ inputs.standalone_suffix }}
106-
ANSYS_VERSION : ${{ github.event.inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}
106+
ANSYS_VERSION : ${{ inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}
107107

108108
- name: "Check licences of packages"
109109
uses: ansys/pydpf-actions/[email protected]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
- uses: actions/checkout@v4
6161

6262
- name: "Set licensing if necessary"
63-
if: ${{ (github.event.inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT) > '231' }}
63+
if: ${{ (inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT) > '231' }}
6464
shell: bash
6565
run: |
6666
echo "ANSYS_DPF_ACCEPT_LA=Y" >> $GITHUB_ENV
@@ -104,7 +104,7 @@ jobs:
104104
with:
105105
dpf-standalone-TOKEN: ${{secrets.DPF_PIPELINE}}
106106
standalone_suffix: ${{ inputs.standalone_suffix }}
107-
ANSYS_VERSION : ${{ github.event.inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}
107+
ANSYS_VERSION : ${{ inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}
108108

109109
- name: "Check licences of packages"
110110
uses: ansys/pydpf-actions/[email protected]

‎.github/workflows/test_docker.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jobs:
8585
with:
8686
dpf-standalone-TOKEN: ${{secrets.DPF_PIPELINE}}
8787
standalone_suffix: ${{ inputs.standalone_suffix }}
88-
ANSYS_VERSION : ${{ github.event.inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}
88+
ANSYS_VERSION : ${{ inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}
8989

9090
- name: "Check licences of packages"
9191
uses: ansys/pydpf-actions/[email protected]
@@ -217,21 +217,21 @@ jobs:
217217
- name: "Upload Test Results"
218218
uses: actions/upload-artifact@v4
219219
with:
220-
name: ${{ env.PACKAGE_NAME }}_${{ matrix.python-version }}_${{ matrix.os }}_pytest_${{ github.event.inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}_docker
220+
name: ${{ env.PACKAGE_NAME }}_${{ matrix.python-version }}_${{ matrix.os }}_pytest_${{ inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}_docker
221221
path: tests/junit/test-results.xml
222222
timeout-minutes: 5
223223

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

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

‎.github/workflows/update_operators.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ jobs:
4747
with:
4848
dpf-standalone-TOKEN: ${{secrets.DPF_PIPELINE}}
4949
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
50-
ANSYS_VERSION : ${{ github.event.inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}
50+
ANSYS_VERSION : ${{ inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}
5151

5252
- name: "Update ansys-grpc-dpf"
5353
shell: bash
5454
run: |
55-
wheel_file=$(find ./dpf-standalone/${{ github.event.inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}/dist -name "ansys_grpc_dpf-*" -type f)
55+
wheel_file=$(find ./dpf-standalone/${{ inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}/dist -name "ansys_grpc_dpf-*" -type f)
5656
echo $wheel_file
5757
rm -r src/ansys/grpc
5858
unzip -o $wheel_file "ansys/**/*" -d src/
@@ -62,7 +62,7 @@ jobs:
6262
- name: "Update ansys-dpf-gate"
6363
shell: bash
6464
run: |
65-
wheel_file=$(find ./dpf-standalone/v${{ github.event.inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}/dist -name "ansys_dpf_gate-*" -type f)
65+
wheel_file=$(find ./dpf-standalone/v${{ inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}/dist -name "ansys_dpf_gate-*" -type f)
6666
echo $wheel_file
6767
rm -r src/ansys/dpf/gate/generated
6868
unzip -o $wheel_file "ansys/dpf/gate/generated/*" -d src/
@@ -73,7 +73,7 @@ jobs:
7373
- name: "Update ansys-dpf-gatebin lin"
7474
shell: bash
7575
run: |
76-
wheel_file=$(find ./dpf-standalone/v${{ github.event.inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}/dist -name "ansys_dpf_gatebin-*linux1*" -type f)
76+
wheel_file=$(find ./dpf-standalone/v${{ inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}/dist -name "ansys_dpf_gatebin-*linux1*" -type f)
7777
echo $wheel_file
7878
rm -r src/ansys/dpf/gatebin
7979
unzip -o $wheel_file "ansys/**/*" -d src/
@@ -82,7 +82,7 @@ jobs:
8282
- name: "Update ansys-dpf-gatebin win"
8383
shell: bash
8484
run: |
85-
wheel_file=$(find ./dpf-standalone/v${{ github.event.inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}/dist -name "ansys_dpf_gatebin-*win*" -type f)
85+
wheel_file=$(find ./dpf-standalone/v${{ inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}/dist -name "ansys_dpf_gatebin-*win*" -type f)
8686
echo $wheel_file
8787
unzip -o $wheel_file "ansys/**/*" -d src/
8888
chmod -R 777 src/ansys/dpf/gatebin
@@ -131,9 +131,9 @@ jobs:
131131
src/ansys/dpf/core/operators/*
132132
doc/source/_static/dpf_operators.html
133133
commit-message: update generated code
134-
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 }}
134+
title: Update generated code for DPF ${{ inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}${{ github.event.inputs.standalone_branch_suffix || '' }} on ${{ github.ref_name }}
135135
body: An update of generated code has been triggered either manually or by an update in the dpf-standalone repository.
136-
branch: maint/update_code_for_${{ github.event.inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}${{ github.event.inputs.standalone_branch_suffix || '' }}_on_${{ github.ref_name }}
136+
branch: maint/update_code_for_${{ inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}${{ github.event.inputs.standalone_branch_suffix || '' }}_on_${{ github.ref_name }}
137137
labels: server-sync
138138
token: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}
139139
reviewers: ${{ github.ref_name == 'master' && 'ansys/dpf_integration_proxies' || '' }}

0 commit comments

Comments
 (0)