Skip to content

Commit f4015ff

Browse files
authored
Merge branch 'main' into fix/ci
2 parents 951448f + 1afda8f commit f4015ff

32 files changed

+342
-290
lines changed

.github/workflows/doc-build-dev-nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ permissions:
1313

1414
env:
1515
DOCUMENTATION_CNAME: "fluent.docs.pyansys.com"
16-
DOC_DEPLOYMENT_IMAGE_TAG: v26.1.0
16+
DOC_DEPLOYMENT_IMAGE_TAG: ${{ vars.FLUENT_STABLE_IMAGE_DEV }}
1717
ANSYSLMD_LICENSE_FILE: ${{ format('1055@{0}', secrets.LICENSE_SERVER) }}
1818
PYFLUENT_TIMEOUT_FORCE_EXIT: 30
1919
PYFLUENT_LAUNCH_CONTAINER: 1

.github/workflows/execute-examples-weekly.yml

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ jobs:
3434
version: 252
3535
- image-tag: v26.1.0
3636
version: 261
37+
env:
38+
FLUENT_IMAGE_TAG: ${{ matrix.version == 261 && vars.FLUENT_STABLE_IMAGE_DEV || matrix.image-tag }}
3739

3840
steps:
3941
- uses: actions/checkout@v4
@@ -66,8 +68,6 @@ jobs:
6668
else
6769
echo "Image already exists locally, skipping pull."
6870
fi
69-
env:
70-
FLUENT_IMAGE_TAG: ${{ matrix.image-tag }}
7171
7272
- name: Install Dependencies
7373
run: |
@@ -84,99 +84,71 @@ jobs:
8484
run: |
8585
echo "Executing examples"
8686
sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
87-
env:
88-
FLUENT_IMAGE_TAG: ${{ matrix.image-tag }}
8987
9088
# ~1 minute
9189
- name: Execute mixing_elbow_settings_api.py
9290
run: |
9391
python examples/00-fluent/mixing_elbow_settings_api.py
94-
env:
95-
FLUENT_IMAGE_TAG: ${{ matrix.image-tag }}
9692
9793
# ~1 minute
9894
- name: Execute species_transport.py
9995
run: |
10096
python examples/00-fluent/species_transport.py
101-
env:
102-
FLUENT_IMAGE_TAG: ${{ matrix.image-tag }}
10397
10498
# ~1 minute
10599
- name: Execute modeling_cavitation.py
106100
run: |
107101
python examples/00-fluent/modeling_cavitation.py
108-
env:
109-
FLUENT_IMAGE_TAG: ${{ matrix.image-tag }}
110102
111103
# ~3 minutes
112104
- name: Execute ahmed_body_workflow.py
113105
run: |
114106
python examples/00-fluent/ahmed_body_workflow.py
115-
env:
116-
FLUENT_IMAGE_TAG: ${{ matrix.image-tag }}
117107
118108
# ~4 minutes
119109
- name: Execute exhaust_system_settings_api.py
120110
run: |
121111
python examples/00-fluent/exhaust_system_settings_api.py
122-
env:
123-
FLUENT_IMAGE_TAG: ${{ matrix.image-tag }}
124112
125113
# ~4 minutes
126114
- name: Execute parametric_static_mixer_1.py
127115
run: |
128116
python examples/00-fluent/parametric_static_mixer_1.py
129-
env:
130-
FLUENT_IMAGE_TAG: ${{ matrix.image-tag }}
131117
132118
# ~5 minutes
133119
- name: Execute brake.py
134120
run: |
135121
python examples/00-fluent/brake.py
136-
env:
137-
FLUENT_IMAGE_TAG: ${{ matrix.image-tag }}
138122
139123
# ~5 minutes
140124
- name: Execute external_compressible_flow.py
141125
run: |
142126
python examples/00-fluent/external_compressible_flow.py
143-
env:
144-
FLUENT_IMAGE_TAG: ${{ matrix.image-tag }}
145127
146128
# ~15 minutes
147129
- name: Execute radiation_headlamp.py
148130
run: |
149131
python examples/00-fluent/radiation_headlamp.py
150-
env:
151-
FLUENT_IMAGE_TAG: ${{ matrix.image-tag }}
152132
153133
# ~17 minutes
154134
- name: Execute DOE_ML.py
155135
run: |
156136
python examples/00-fluent/DOE_ML.py
157-
env:
158-
FLUENT_IMAGE_TAG: ${{ matrix.image-tag }}
159137
160138
# ~17 minutes
161139
- name: Execute frozen_rotor_workflow.py
162140
run: |
163141
python examples/00-fluent/frozen_rotor_workflow.py
164-
env:
165-
FLUENT_IMAGE_TAG: ${{ matrix.image-tag }}
166142
167143
# ~26 minutes, hangs for v26.1.0
168144
- name: Execute lunar_lander_thermal.py
169145
run: |
170146
python examples/00-fluent/lunar_lander_thermal.py
171-
env:
172-
FLUENT_IMAGE_TAG: v25.2.0
173147
174148
# ~40 minutes
175149
- name: Execute tyler_sofrin_modes.py
176150
run: |
177151
python examples/00-fluent/tyler_sofrin_modes.py
178-
env:
179-
FLUENT_IMAGE_TAG: ${{ matrix.image-tag }}
180152
181153
# https://github.com/ansys/pyfluent/issues/4157
182154
# - name: Execute conjugate_heat_transfer.py

.github/workflows/force-update-stable-Fluent-image-version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ permissions:
1717
env:
1818
ANSYSLMD_LICENSE_FILE: ${{ format('1055@{0}', secrets.LICENSE_SERVER) }}
1919
MAIN_PYTHON_VERSION: "3.10"
20-
FLUENT_IMAGE_TAG: v26.1.0
20+
FLUENT_IMAGE_TAG: v26.1.latest
2121
FLUENT_VERSION: 261
2222

2323
jobs:

.github/workflows/test-run-custom.yml

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ jobs:
4747
version: 252
4848
- image-tag: v26.1.0
4949
version: 261
50+
env:
51+
FLUENT_IMAGE_TAG: ${{ matrix.version == 261 && vars.FLUENT_STABLE_IMAGE_DEV || matrix.image-tag }}
5052

5153
steps:
5254
- uses: actions/checkout@v4
@@ -84,21 +86,10 @@ jobs:
8486
password: ${{ secrets.GITHUB_TOKEN }}
8587

8688
- name: Pull Fluent docker image
87-
if: matrix.image-tag != 'v26.1.0'
8889
run: make docker-pull
89-
env:
90-
FLUENT_IMAGE_TAG: ${{ matrix.image-tag }}
91-
92-
- name: Pull Fluent docker image dev
93-
if: matrix.image-tag == 'v26.1.0'
94-
run: make docker-pull
95-
env:
96-
FLUENT_IMAGE_TAG: ${{ vars.FLUENT_STABLE_IMAGE_DEV }}
9790

9891
- name: Run API codegen
9992
run: make api-codegen
100-
env:
101-
FLUENT_IMAGE_TAG: ${{ matrix.image-tag }}
10293

10394
- name: Print Fluent version info
10495
run: |
@@ -115,8 +106,6 @@ jobs:
115106
sudo rm -rf /home/ansys/Downloads/ansys_fluent_core_examples/*
116107
make install-test
117108
python -m pytest -v --no-cov --capture=no -k test_parametric_workflow --nightly
118-
env:
119-
FLUENT_IMAGE_TAG: ${{ matrix.image-tag }}
120109
121110
- name: Cleanup previous docker containers
122111
if: always()

.github/workflows/test-run-dev-version-nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ env:
1919
PYFLUENT_WATCHDOG_DEBUG: "OFF"
2020
PYFLUENT_HIDE_LOG_SECRETS: 1
2121
PYTHON_VERSION: "3.10"
22-
FLUENT_IMAGE_TAG: v26.1.0
22+
FLUENT_IMAGE_TAG: v26.1.latest
2323
FLUENT_VERSION: 261
2424

2525
jobs:

.github/workflows/test-run-wo-codegen-weekly.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ jobs:
9191
version: 252
9292
- image-tag: v26.1.0
9393
version: 261
94+
env:
95+
FLUENT_IMAGE_TAG: ${{ matrix.version == 261 && vars.FLUENT_STABLE_IMAGE_DEV || matrix.image-tag }}
9496

9597
steps:
9698
- uses: actions/checkout@v4
@@ -124,15 +126,11 @@ jobs:
124126

125127
- name: Pull Fluent docker image
126128
run: make docker-pull
127-
env:
128-
FLUENT_IMAGE_TAG: ${{ matrix.image-tag }}
129129

130130
- name: Unit Testing
131131
run: |
132132
make install-test
133133
make unittest-all-${{ matrix.version }}-no-codegen
134-
env:
135-
FLUENT_IMAGE_TAG: ${{ matrix.image-tag }}
136134
137135
- name: Cleanup previous docker containers
138136
if: always()
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update outdated field_info docs [skip tests]

doc/changelog.d/4269.test.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Updates to optislang integration tests
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Transaction -> batch

doc/changelog.d/4274.fixed.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Check localhost for grpc connection before other ips

0 commit comments

Comments
 (0)