Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow choosing the DPF Server branch when releasing #681

Merged
merged 15 commits into from
Dec 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ concurrency:
cancel-in-progress: true

env:
PACKAGE_NAME: ansys-dpf-core
MODULE: core
ANSYS_VERSION: 232

jobs:
Expand Down Expand Up @@ -66,19 +64,24 @@ jobs:
wheel: true
wheelhouse: false
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
custom-requirements: requirements/requirements_dev.txt
custom-requirements: ''
secrets: inherit

docker_tests:
name: "Build and Test on Docker"
uses: ./.github/workflows/test_docker.yml
with:
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
custom-requirements: ''
secrets: inherit

docs:
if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft
uses: ./.github/workflows/docs.yml
with:
ANSYS_VERSION: "232"
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
custom-requirements: ''
secrets: inherit

examples:
Expand All @@ -87,6 +90,8 @@ jobs:
with:
ANSYS_VERSION: "232"
python_versions: '["3.8"]'
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
custom-requirements: ''
secrets: inherit

retro_231:
Expand Down Expand Up @@ -125,4 +130,6 @@ jobs:
uses: ./.github/workflows/pydpf-post.yml
with:
ANSYS_VERSION: "232"
standalone_suffix: ${{ github.event.inputs.standalone_branch_suffix || '' }}
custom-requirements: ''
secrets: inherit
14 changes: 8 additions & 6 deletions .github/workflows/ci_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,6 @@ concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

env:
PACKAGE_NAME: ansys-dpf-core
MODULE: core
ANSYS_VERSION: 232
extra: "--find-links .github/"

jobs:
debug:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -67,19 +61,22 @@ jobs:
python_versions: '["3.7", "3.8", "3.9", "3.10"]'
wheel: true
wheelhouse: true
standalone_suffix: ".pre0"
secrets: inherit

docs:
uses: ./.github/workflows/docs.yml
with:
ANSYS_VERSION: "232"
standalone_suffix: ".pre0"
secrets: inherit

examples:
uses: ./.github/workflows/examples.yml
with:
ANSYS_VERSION: "232"
python_versions: '["3.7", "3.8", "3.9", "3.10"]'
standalone_suffix: ".pre0"
secrets: inherit

retro_231:
Expand Down Expand Up @@ -114,6 +111,7 @@ jobs:
uses: ./.github/workflows/pydpf-post.yml
with:
ANSYS_VERSION: "232"
standalone_suffix: ".pre0"
secrets: inherit

pydpf-post_231:
Expand All @@ -140,11 +138,15 @@ jobs:
gate:
name: "gate"
uses: ./.github/workflows/gate.yml
with:
standalone_suffix: ".pre0"
secrets: inherit

docker_tests:
name: "Build and Test on Docker"
uses: ./.github/workflows/test_docker.yml
with:
standalone_suffix: ".pre0"
secrets: inherit

draft_release:
Expand Down
25 changes: 22 additions & 3 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,16 @@ on:
required: false
type: string
default: "232"
secrets:
DPF_PIPELINE:
required: true
standalone_suffix:
description: "Suffix of the branch on standalone"
required: false
type: string
default: ''
custom-requirements:
description: "Path to requirements.txt file to install"
required: false
type: string
default: ''
# Can be called manually
workflow_dispatch:
inputs:
Expand All @@ -28,6 +35,16 @@ on:
required: true
type: string
default: "232"
standalone_suffix:
description: "Suffix of the branch on standalone"
required: false
type: string
default: ''
custom-requirements:
description: "Path to requirements.txt file to install"
required: false
type: string
default: ''

env:
PACKAGE_NAME: ansys-dpf-core
Expand Down Expand Up @@ -68,6 +85,8 @@ jobs:
wheel: false
wheelhouse: false
extra-pip-args: ${{ env.extra }}
standalone_suffix: ${{ inputs.standalone_suffix }}
custom-requirements: ${{ inputs.custom-requirements }}

- name: "Setup headless display"
uses: pyvista/setup-headless-display-action@v1
Expand Down
22 changes: 22 additions & 0 deletions .github/workflows/examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,16 @@ on:
required: false
type: string
default: "232"
standalone_suffix:
description: "Suffix of the branch on standalone"
required: false
type: string
default: ''
custom-requirements:
description: "Path to requirements.txt file to install"
required: false
type: string
default: ''
# Can be called manually
workflow_dispatch:
inputs:
Expand All @@ -25,6 +35,16 @@ on:
required: true
type: string
default: "232"
standalone_suffix:
description: "Suffix of the branch on standalone"
required: false
type: string
default: ''
custom-requirements:
description: "Path to requirements.txt file to install"
required: false
type: string
default: ''

env:
PACKAGE_NAME: ansys-dpf-core
Expand Down Expand Up @@ -79,6 +99,8 @@ jobs:
wheelhouse: false
wheel: false
extra-pip-args: ${{ env.extra }}
standalone_suffix: ${{ inputs.standalone_suffix }}
custom-requirements: ${{ inputs.custom-requirements }}

- name: "Prepare Testing Environment"
uses: pyansys/pydpf-actions/prepare_tests@v2.3
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/gate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ on:
required: false
type: string
default: "232"
standalone_suffix:
description: "Suffix of the branch on standalone"
required: false
type: string
default: ''
# Can be called manually
workflow_dispatch:
inputs:
Expand All @@ -25,6 +30,11 @@ on:
required: true
type: string
default: "232"
standalone_suffix:
description: "Suffix of the branch on standalone"
required: false
type: string
default: ''

env:
PACKAGE_NAME: ansys-dpf-core
Expand Down Expand Up @@ -79,6 +89,8 @@ jobs:
wheelhouse: false
wheel: false
extra-pip-args: ${{ env.extra }}
standalone_suffix: ${{ inputs.standalone_suffix }}
custom-requirements: ${{ inputs.custom-requirements }}

- name: "Prepare Testing Environment"
uses: pyansys/pydpf-actions/prepare_tests@v2.3
Expand Down
25 changes: 22 additions & 3 deletions .github/workflows/pydpf-post.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,16 @@ on:
required: false
type: string
default: "232"
secrets:
DPF_PIPELINE:
required: true
standalone_suffix:
description: "Suffix of the branch on standalone"
required: false
type: string
default: ''
custom-requirements:
description: "Path to requirements.txt file to install"
required: false
type: string
default: ''
# Can be called manually
workflow_dispatch:
inputs:
Expand All @@ -26,6 +33,16 @@ on:
required: true
type: string
default: "232"
standalone_suffix:
description: "Suffix of the branch on standalone"
required: false
type: string
default: ''
custom-requirements:
description: "Path to requirements.txt file to install"
required: false
type: string
default: ''

env:
PACKAGE_NAME: ansys-dpf-core
Expand Down Expand Up @@ -70,6 +87,8 @@ jobs:
wheel: false
wheelhouse: false
extra-pip-args: ${{ env.extra }}
standalone_suffix: ${{ inputs.standalone_suffix }}
custom-requirements: ${{ inputs.custom-requirements }}

- name: "Install ansys-grpc-dpf==0.4.0"
if: inputs.ANSYS_VERSION == 221
Expand Down
24 changes: 24 additions & 0 deletions .github/workflows/test_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,30 @@ name: test_docker
on:
# Can be called by the CI
workflow_call:
inputs:
standalone_suffix:
description: "Suffix of the branch on standalone"
required: false
type: string
default: ''
custom-requirements:
description: "Path to requirements.txt file to install"
required: false
type: string
default: ''
# Can be called manually
workflow_dispatch:
inputs:
standalone_suffix:
description: "Suffix of the branch on standalone"
required: false
type: string
default: ''
custom-requirements:
description: "Path to requirements.txt file to install"
required: false
type: string
default: ''

env:
PACKAGE_NAME: ansys-dpf-core
Expand Down Expand Up @@ -38,6 +60,8 @@ jobs:
install_extras: plotting
wheelhouse: false
extra-pip-args: ${{ env.extra }}
standalone_suffix: ${{ inputs.standalone_suffix }}
custom-requirements: ${{ inputs.custom-requirements }}

- name: "Prepare Testing Environment"
uses: pyansys/pydpf-actions/prepare_tests@v2.3
Expand Down