Skip to content

Commit 5b2875c

Browse files
authored
Allow choosing the DPF Server branch when releasing (#681)
* Take suffix when set as env * docs job accepts standalone_suffix and custom-requirements inputs * Cannot use env to set default standalone_suffix input, hardcoding it for now * Fix docs job input * Remove secret as input as secrets are inherited * Allow both new inputs for examples * Allow both new inputs for PyDPF-Post job * Allow both new inputs for gate job and set it for ci_release.yml * Set custom-requirements to '' temporarily * Give custom-requirements as input only when necessary * Set back default standalone branch to no suffix for CI * CI_release uses .pre0 * ci_release.yml tests .pre0 (no manual call possible) * Add custom-requirements and standalone_suffix as inputs for test_docker.yml * Fix test_docker.yml inputs
1 parent 234eaf3 commit 5b2875c

File tree

7 files changed

+120
-15
lines changed

7 files changed

+120
-15
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ concurrency:
2121
cancel-in-progress: true
2222

2323
env:
24-
PACKAGE_NAME: ansys-dpf-core
25-
MODULE: core
2624
ANSYS_VERSION: 232
2725

2826
jobs:
@@ -66,19 +64,24 @@ jobs:
6664
wheel: true
6765
wheelhouse: false
6866
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
69-
custom-requirements: requirements/requirements_dev.txt
67+
custom-requirements: ''
7068
secrets: inherit
7169

7270
docker_tests:
7371
name: "Build and Test on Docker"
7472
uses: ./.github/workflows/test_docker.yml
73+
with:
74+
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
75+
custom-requirements: ''
7576
secrets: inherit
7677

7778
docs:
7879
if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft
7980
uses: ./.github/workflows/docs.yml
8081
with:
8182
ANSYS_VERSION: "232"
83+
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
84+
custom-requirements: ''
8285
secrets: inherit
8386

8487
examples:
@@ -87,6 +90,8 @@ jobs:
8790
with:
8891
ANSYS_VERSION: "232"
8992
python_versions: '["3.8"]'
93+
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
94+
custom-requirements: ''
9095
secrets: inherit
9196

9297
retro_231:
@@ -125,4 +130,6 @@ jobs:
125130
uses: ./.github/workflows/pydpf-post.yml
126131
with:
127132
ANSYS_VERSION: "232"
133+
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
134+
custom-requirements: ''
128135
secrets: inherit

.github/workflows/ci_release.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@ concurrency:
2121
group: ${{ github.workflow }}-${{ github.ref }}
2222
cancel-in-progress: true
2323

24-
env:
25-
PACKAGE_NAME: ansys-dpf-core
26-
MODULE: core
27-
ANSYS_VERSION: 232
28-
extra: "--find-links .github/"
29-
3024
jobs:
3125
debug:
3226
runs-on: ubuntu-latest
@@ -67,19 +61,22 @@ jobs:
6761
python_versions: '["3.7", "3.8", "3.9", "3.10"]'
6862
wheel: true
6963
wheelhouse: true
64+
standalone_suffix: ".pre0"
7065
secrets: inherit
7166

7267
docs:
7368
uses: ./.github/workflows/docs.yml
7469
with:
7570
ANSYS_VERSION: "232"
71+
standalone_suffix: ".pre0"
7672
secrets: inherit
7773

7874
examples:
7975
uses: ./.github/workflows/examples.yml
8076
with:
8177
ANSYS_VERSION: "232"
8278
python_versions: '["3.7", "3.8", "3.9", "3.10"]'
79+
standalone_suffix: ".pre0"
8380
secrets: inherit
8481

8582
retro_231:
@@ -114,6 +111,7 @@ jobs:
114111
uses: ./.github/workflows/pydpf-post.yml
115112
with:
116113
ANSYS_VERSION: "232"
114+
standalone_suffix: ".pre0"
117115
secrets: inherit
118116

119117
pydpf-post_231:
@@ -140,11 +138,15 @@ jobs:
140138
gate:
141139
name: "gate"
142140
uses: ./.github/workflows/gate.yml
141+
with:
142+
standalone_suffix: ".pre0"
143143
secrets: inherit
144144

145145
docker_tests:
146146
name: "Build and Test on Docker"
147147
uses: ./.github/workflows/test_docker.yml
148+
with:
149+
standalone_suffix: ".pre0"
148150
secrets: inherit
149151

150152
draft_release:

.github/workflows/docs.yml

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,16 @@ on:
1212
required: false
1313
type: string
1414
default: "232"
15-
secrets:
16-
DPF_PIPELINE:
17-
required: true
15+
standalone_suffix:
16+
description: "Suffix of the branch on standalone"
17+
required: false
18+
type: string
19+
default: ''
20+
custom-requirements:
21+
description: "Path to requirements.txt file to install"
22+
required: false
23+
type: string
24+
default: ''
1825
# Can be called manually
1926
workflow_dispatch:
2027
inputs:
@@ -28,6 +35,16 @@ on:
2835
required: true
2936
type: string
3037
default: "232"
38+
standalone_suffix:
39+
description: "Suffix of the branch on standalone"
40+
required: false
41+
type: string
42+
default: ''
43+
custom-requirements:
44+
description: "Path to requirements.txt file to install"
45+
required: false
46+
type: string
47+
default: ''
3148

3249
env:
3350
PACKAGE_NAME: ansys-dpf-core
@@ -68,6 +85,8 @@ jobs:
6885
wheel: false
6986
wheelhouse: false
7087
extra-pip-args: ${{ env.extra }}
88+
standalone_suffix: ${{ inputs.standalone_suffix }}
89+
custom-requirements: ${{ inputs.custom-requirements }}
7190

7291
- name: "Setup headless display"
7392
uses: pyvista/setup-headless-display-action@v1

.github/workflows/examples.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,16 @@ on:
1212
required: false
1313
type: string
1414
default: "232"
15+
standalone_suffix:
16+
description: "Suffix of the branch on standalone"
17+
required: false
18+
type: string
19+
default: ''
20+
custom-requirements:
21+
description: "Path to requirements.txt file to install"
22+
required: false
23+
type: string
24+
default: ''
1525
# Can be called manually
1626
workflow_dispatch:
1727
inputs:
@@ -25,6 +35,16 @@ on:
2535
required: true
2636
type: string
2737
default: "232"
38+
standalone_suffix:
39+
description: "Suffix of the branch on standalone"
40+
required: false
41+
type: string
42+
default: ''
43+
custom-requirements:
44+
description: "Path to requirements.txt file to install"
45+
required: false
46+
type: string
47+
default: ''
2848

2949
env:
3050
PACKAGE_NAME: ansys-dpf-core
@@ -79,6 +99,8 @@ jobs:
7999
wheelhouse: false
80100
wheel: false
81101
extra-pip-args: ${{ env.extra }}
102+
standalone_suffix: ${{ inputs.standalone_suffix }}
103+
custom-requirements: ${{ inputs.custom-requirements }}
82104

83105
- name: "Prepare Testing Environment"
84106
uses: pyansys/pydpf-actions/[email protected]

.github/workflows/gate.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ on:
1212
required: false
1313
type: string
1414
default: "232"
15+
standalone_suffix:
16+
description: "Suffix of the branch on standalone"
17+
required: false
18+
type: string
19+
default: ''
1520
# Can be called manually
1621
workflow_dispatch:
1722
inputs:
@@ -25,6 +30,11 @@ on:
2530
required: true
2631
type: string
2732
default: "232"
33+
standalone_suffix:
34+
description: "Suffix of the branch on standalone"
35+
required: false
36+
type: string
37+
default: ''
2838

2939
env:
3040
PACKAGE_NAME: ansys-dpf-core
@@ -79,6 +89,8 @@ jobs:
7989
wheelhouse: false
8090
wheel: false
8191
extra-pip-args: ${{ env.extra }}
92+
standalone_suffix: ${{ inputs.standalone_suffix }}
93+
custom-requirements: ${{ inputs.custom-requirements }}
8294

8395
- name: "Prepare Testing Environment"
8496
uses: pyansys/pydpf-actions/[email protected]

.github/workflows/pydpf-post.yml

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,16 @@ on:
1111
required: false
1212
type: string
1313
default: "232"
14-
secrets:
15-
DPF_PIPELINE:
16-
required: true
14+
standalone_suffix:
15+
description: "Suffix of the branch on standalone"
16+
required: false
17+
type: string
18+
default: ''
19+
custom-requirements:
20+
description: "Path to requirements.txt file to install"
21+
required: false
22+
type: string
23+
default: ''
1724
# Can be called manually
1825
workflow_dispatch:
1926
inputs:
@@ -26,6 +33,16 @@ on:
2633
required: true
2734
type: string
2835
default: "232"
36+
standalone_suffix:
37+
description: "Suffix of the branch on standalone"
38+
required: false
39+
type: string
40+
default: ''
41+
custom-requirements:
42+
description: "Path to requirements.txt file to install"
43+
required: false
44+
type: string
45+
default: ''
2946

3047
env:
3148
PACKAGE_NAME: ansys-dpf-core
@@ -70,6 +87,8 @@ jobs:
7087
wheel: false
7188
wheelhouse: false
7289
extra-pip-args: ${{ env.extra }}
90+
standalone_suffix: ${{ inputs.standalone_suffix }}
91+
custom-requirements: ${{ inputs.custom-requirements }}
7392

7493
- name: "Install ansys-grpc-dpf==0.4.0"
7594
if: inputs.ANSYS_VERSION == 221

.github/workflows/test_docker.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,30 @@ name: test_docker
33
on:
44
# Can be called by the CI
55
workflow_call:
6+
inputs:
7+
standalone_suffix:
8+
description: "Suffix of the branch on standalone"
9+
required: false
10+
type: string
11+
default: ''
12+
custom-requirements:
13+
description: "Path to requirements.txt file to install"
14+
required: false
15+
type: string
16+
default: ''
617
# Can be called manually
718
workflow_dispatch:
19+
inputs:
20+
standalone_suffix:
21+
description: "Suffix of the branch on standalone"
22+
required: false
23+
type: string
24+
default: ''
25+
custom-requirements:
26+
description: "Path to requirements.txt file to install"
27+
required: false
28+
type: string
29+
default: ''
830

931
env:
1032
PACKAGE_NAME: ansys-dpf-core
@@ -38,6 +60,8 @@ jobs:
3860
install_extras: plotting
3961
wheelhouse: false
4062
extra-pip-args: ${{ env.extra }}
63+
standalone_suffix: ${{ inputs.standalone_suffix }}
64+
custom-requirements: ${{ inputs.custom-requirements }}
4165

4266
- name: "Prepare Testing Environment"
4367
uses: pyansys/pydpf-actions/[email protected]

0 commit comments

Comments
 (0)