Skip to content

Commit 9cec7ba

Browse files
authored
Merge branch 'main' into feat/py313
2 parents df5bd28 + b1a0556 commit 9cec7ba

File tree

4 files changed

+22
-4
lines changed

4 files changed

+22
-4
lines changed

.github/workflows/ci_cd.yml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ jobs:
135135

136136
- name: Set up headless display
137137
if: env.SKIP_UNSTABLE == 'false'
138-
uses: pyvista/setup-headless-display-action@v2
138+
uses: pyvista/setup-headless-display-action@v3
139139
with:
140140
pyvista: false
141141

@@ -170,6 +170,14 @@ jobs:
170170
run:
171171
echo "ANSRV_GEO_LICENSE_SERVER=${{ secrets.INTERNAL_LICENSE_SERVER }}" | Out-File -FilePath $env:GITHUB_ENV -Append
172172

173+
- name: Stop any running containers
174+
run: |
175+
$dockerContainers = docker ps -a -q
176+
if (-not [string]::IsNullOrEmpty($dockerContainers)) {
177+
docker stop $dockerContainers
178+
docker rm $dockerContainers
179+
}
180+
173181
- name: Start Geometry service and verify start
174182
if: env.SKIP_UNSTABLE == 'false'
175183
run: |
@@ -254,7 +262,7 @@ jobs:
254262
PYVISTA_OFF_SCREEN: true
255263
steps:
256264
- name: Set up headless display
257-
uses: pyvista/setup-headless-display-action@v2
265+
uses: pyvista/setup-headless-display-action@v3
258266
with:
259267
pyvista: false
260268

@@ -273,6 +281,14 @@ jobs:
273281
run:
274282
echo "ANSRV_GEO_LICENSE_SERVER=${{ secrets.INTERNAL_LICENSE_SERVER }}" | Out-File -FilePath $env:GITHUB_ENV -Append
275283

284+
- name: Stop any running containers
285+
run: |
286+
$dockerContainers = docker ps -a -q
287+
if (-not [string]::IsNullOrEmpty($dockerContainers)) {
288+
docker stop $dockerContainers
289+
docker rm $dockerContainers
290+
}
291+
276292
- name: Start Geometry service and verify start
277293
run: docker run --detach --name ${{ env.GEO_CONT_NAME }} -e LICENSE_SERVER=${{ env.ANSRV_GEO_LICENSE_SERVER }} -p ${{ env.ANSRV_GEO_PORT }}:50051 ${{ env.ANSRV_GEO_IMAGE_WINDOWS_TAG }}
278294

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
bump ansys-tools-visualization-interface from 0.5.0 to 0.6.0
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
bump pyvista/setup-headless-display-action to v3

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ all = [
5050
tests = [
5151
"ansys-platform-instancemanagement==1.1.2",
5252
"ansys-tools-path==0.7.0",
53-
"ansys-tools-visualization-interface==0.5.0",
53+
"ansys-tools-visualization-interface==0.6.0",
5454
"beartype==0.19.0",
5555
"docker==7.1.0",
5656
"grpcio==1.67.1",
@@ -78,7 +78,7 @@ tests-minimal = [
7878
doc = [
7979
"ansys-sphinx-theme[autoapi]==1.2.2",
8080
"ansys-tools-path==0.7.0",
81-
"ansys-tools-visualization-interface==0.5.0",
81+
"ansys-tools-visualization-interface==0.6.0",
8282
"beartype==0.19.0",
8383
"docker==7.1.0",
8484
"grpcio==1.67.1",

0 commit comments

Comments
 (0)