Skip to content

Commit

Permalink
Update the pipelines for DPF 2023.2.pre0 (#608)
Browse files Browse the repository at this point in the history
- Bump ANSYS_VERSION and default to DPF Server 23.2.pre0
- Update the CI to work with DPF Server 23.2.pre0
- Switch to pydpf-actions 2.3
- Use nick-fields/retry action to rerun failed steps
- Add a "pip list" step to all testing jobs for easier debugging

Signed-off-by: paul.profizi <paul.profizi@ansys.com>
Co-authored-by: cbellot <camille.bellot@ansys.com>
Co-authored-by: anslpa <74727146+anslpa@users.noreply.github.com>
  • Loading branch information
3 people authored Nov 24, 2022
1 parent 0f3e681 commit 9b842f4
Show file tree
Hide file tree
Showing 40 changed files with 835 additions and 464 deletions.
18 changes: 14 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ concurrency:
env:
PACKAGE_NAME: ansys-dpf-core
MODULE: core
ANSYS_VERSION: 231
ANSYS_VERSION: 232
extra: "--find-links .github/"

jobs:
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
tests:
uses: ./.github/workflows/tests.yml
with:
ANSYS_VERSION: "231"
ANSYS_VERSION: "232"
python_versions: '["3.8"]'
wheel: true
wheelhouse: false
Expand All @@ -70,15 +70,25 @@ jobs:
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: "231"
ANSYS_VERSION: "232"
secrets: inherit

examples:
if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft
uses: ./.github/workflows/examples.yml
with:
ANSYS_VERSION: "232"
python_versions: '["3.8"]'
secrets: inherit

retro_231:
name: "retro 231"
if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft
uses: ./.github/workflows/tests.yml
with:
ANSYS_VERSION: "231"
python_versions: '["3.8"]'
DOCSTRING: false
secrets: inherit

retro_222:
Expand Down Expand Up @@ -106,6 +116,6 @@ jobs:
if: startsWith(github.head_ref, 'master') || github.event.action == 'ready_for_review' || !github.event.pull_request.draft
uses: ./.github/workflows/pydpf-post.yml
with:
ANSYS_VERSION: "231"
ANSYS_VERSION: "232"
secrets: inherit

24 changes: 20 additions & 4 deletions .github/workflows/ci_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ concurrency:
env:
PACKAGE_NAME: ansys-dpf-core
MODULE: core
ANSYS_VERSION: 231
ANSYS_VERSION: 232
extra: "--find-links .github/"

jobs:
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
tests:
uses: ./.github/workflows/tests.yml
with:
ANSYS_VERSION: "231"
ANSYS_VERSION: "232"
python_versions: '["3.7", "3.8", "3.9", "3.10"]'
wheel: true
wheelhouse: true
Expand All @@ -72,16 +72,25 @@ jobs:
docs:
uses: ./.github/workflows/docs.yml
with:
ANSYS_VERSION: "231"
ANSYS_VERSION: "232"
secrets: inherit

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

retro_231:
name: "retro 231"
uses: ./.github/workflows/tests.yml
with:
ANSYS_VERSION: "231"
python_versions: '["3.8"]'
DOCSTRING: false
secrets: inherit

retro_222:
name: "retro 222"
uses: ./.github/workflows/tests.yml
Expand All @@ -100,6 +109,13 @@ jobs:
DOCSTRING: false
secrets: inherit

pydpf-post_232:
name: "PyDPF-Post with 232"
uses: ./.github/workflows/pydpf-post.yml
with:
ANSYS_VERSION: "232"
secrets: inherit

pydpf-post_231:
name: "PyDPF-Post with 231"
uses: ./.github/workflows/pydpf-post.yml
Expand Down
22 changes: 17 additions & 5 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
ANSYS_VERSION:
required: false
type: string
default: "231"
default: "232"
secrets:
DPF_PIPELINE:
required: true
Expand All @@ -27,7 +27,7 @@ on:
description: "ANSYS version"
required: true
type: string
default: "231"
default: "232"

env:
PACKAGE_NAME: ansys-dpf-core
Expand All @@ -42,14 +42,22 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: "Set licensing if necessary"
if: inputs.ANSYS_VERSION > 231
shell: bash
run: |
echo "ANSYS_DPF_ACCEPT_LA=Y" >> $GITHUB_ENV
echo "ANSYSLMD_LICENSE_FILE=1055@${{ secrets.LICENSE_SERVER }}" >> $GITHUB_ENV
echo "ANSYS_DPF_SERVER_CONTEXT=PREMIUM" >> $GITHUB_ENV
- name: Setup Python
uses: actions/setup-python@v4.2.0
with:
python-version: ${{ inputs.python_version }}

- name: "Build Package"
id: build-package
uses: pyansys/pydpf-actions/build_package@v2.2
uses: pyansys/pydpf-actions/build_package@v2.3
with:
python-version: ${{ inputs.python_version }}
ANSYS_VERSION: ${{inputs.ANSYS_VERSION}}
Expand All @@ -76,7 +84,11 @@ jobs:
pip install -r requirements/requirements_docs.txt
- name: "Kill all servers"
uses: pyansys/pydpf-actions/kill-dpf-servers@v2.2
uses: pyansys/pydpf-actions/kill-dpf-servers@v2.3

- name: "List installed packages"
shell: bash
run: pip list

- name: "Build HTML Documentation"
shell: cmd
Expand All @@ -102,7 +114,7 @@ jobs:
esac
- name: "Kill all servers"
uses: pyansys/pydpf-actions/kill-dpf-servers@v2.2
uses: pyansys/pydpf-actions/kill-dpf-servers@v2.3
if: always()

- name: "Retrieve package version"
Expand Down
26 changes: 17 additions & 9 deletions .github/workflows/examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@ on:
ANSYS_VERSION:
required: false
type: string
default: "231"
secrets:
DPF_PIPELINE:
required: true
default: "232"
# Can be called manually
workflow_dispatch:
inputs:
Expand All @@ -27,7 +24,7 @@ on:
description: "ANSYS version to run."
required: true
type: string
default: "231"
default: "232"

env:
PACKAGE_NAME: ansys-dpf-core
Expand All @@ -43,7 +40,7 @@ jobs:
steps:
- id: set_array
run: |
echo "python_versions=${{ inputs.python_versions }}" >> $GITHUB_OUTPUT
echo "python_versions=${{ toJSON(inputs.python_versions) }}" >> $GITHUB_OUTPUT
examples:
name: "Run Examples"
Expand All @@ -58,13 +55,20 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: "Set licensing if necessary"
if: inputs.ANSYS_VERSION > 231
shell: bash
run: |
echo "ANSYS_DPF_ACCEPT_LA=Y" >> $GITHUB_ENV
echo "ANSYSLMD_LICENSE_FILE=1055@${{ secrets.LICENSE_SERVER }}" >> $GITHUB_ENV
- name: Setup Python
uses: actions/setup-python@v4.2.0
with:
python-version: ${{ matrix.python-version }}

- name: "Build Package"
uses: pyansys/pydpf-actions/build_package@v2.2
uses: pyansys/pydpf-actions/build_package@v2.3
with:
python-version: ${{ matrix.python-version }}
ANSYS_VERSION: ${{inputs.ANSYS_VERSION}}
Expand All @@ -77,10 +81,14 @@ jobs:
extra-pip-args: ${{ env.extra }}

- name: "Prepare Testing Environment"
uses: pyansys/pydpf-actions/prepare_tests@v2.2
uses: pyansys/pydpf-actions/prepare_tests@v2.3
with:
DEBUG: true

- name: "List installed packages"
shell: bash
run: pip list

- name: "Run examples"
shell: bash
working-directory: .ci
Expand All @@ -89,5 +97,5 @@ jobs:
python run_examples.py
- name: "Kill all servers"
uses: pyansys/pydpf-actions/kill-dpf-servers@v2.2
uses: pyansys/pydpf-actions/kill-dpf-servers@v2.3
if: always()
44 changes: 34 additions & 10 deletions .github/workflows/gate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
ANSYS_VERSION:
required: false
type: string
default: "231"
default: "232"
# Can be called manually
workflow_dispatch:
inputs:
Expand All @@ -24,33 +24,51 @@ on:
description: "ANSYS version"
required: true
type: string
default: "231"
default: "232"

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

jobs:
setup:
name: "Setup"
runs-on: ubuntu-latest
outputs:
python_versions: ${{ steps.set_array.outputs.python_versions }}
steps:
- id: set_array
run: |
echo "python_versions=${{ toJSON(inputs.python_versions) }}" >> $GITHUB_OUTPUT
Gate:
name: "Gate"
needs: setup
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
python-version: ${{ inputs.python_versions }}
python-version: ${{ fromJSON(needs.setup.outputs.python_versions) }}
os: ["windows-latest", "ubuntu-latest"]

steps:
- uses: actions/checkout@v3

- name: "Set licensing if necessary"
if: inputs.ANSYS_VERSION > 231
shell: bash
run: |
echo "ANSYS_DPF_ACCEPT_LA=Y" >> $GITHUB_ENV
echo "ANSYSLMD_LICENSE_FILE=1055@${{ secrets.LICENSE_SERVER }}" >> $GITHUB_ENV
- name: Setup Python
uses: actions/setup-python@v4.2.0
with:
python-version: ${{ matrix.python-version }}

- name: "Build Package"
uses: pyansys/pydpf-actions/build_package@v2.2
uses: pyansys/pydpf-actions/build_package@v2.3
with:
python-version: ${{ matrix.python-version }}
ANSYS_VERSION: ${{inputs.ANSYS_VERSION}}
Expand All @@ -62,8 +80,14 @@ jobs:
wheel: false
extra-pip-args: ${{ env.extra }}

- name: "Setup headless display"
uses: pyvista/setup-headless-display-action@v1
- name: "Prepare Testing Environment"
uses: pyansys/pydpf-actions/prepare_tests@v2.3
with:
DEBUG: true

- name: "List installed packages"
shell: bash
run: pip list

- name: "Check examples with gatebin"
shell: bash
Expand All @@ -73,7 +97,7 @@ jobs:
python run_examples.py
- name: "Kill all servers"
uses: pyansys/pydpf-actions/kill-dpf-servers@v2.2
uses: pyansys/pydpf-actions/kill-dpf-servers@v2.3
if: always()

- name: "Uninstall gatebin"
Expand All @@ -92,7 +116,7 @@ jobs:
if: always()

- name: "Kill all servers"
uses: pyansys/pydpf-actions/kill-dpf-servers@v2.2
uses: pyansys/pydpf-actions/kill-dpf-servers@v2.3
if: always()

- name: "Check sanity without gatebin GRPC"
Expand All @@ -105,7 +129,7 @@ jobs:
if: always()

- name: "Kill all servers"
uses: pyansys/pydpf-actions/kill-dpf-servers@v2.2
uses: pyansys/pydpf-actions/kill-dpf-servers@v2.3
if: always()

- name: "Check sanity without gatebin LEGACYGRPC"
Expand All @@ -118,5 +142,5 @@ jobs:
if: always()

- name: "Kill all servers"
uses: pyansys/pydpf-actions/kill-dpf-servers@v2.2
uses: pyansys/pydpf-actions/kill-dpf-servers@v2.3
if: always()
Loading

0 comments on commit 9b842f4

Please sign in to comment.