Skip to content

Commit b75d262

Browse files
RobPasMueRobPasMue
authored
Merge branch 'main' into feat/boolean-transfer-ns
2 parents d4bb7e4 + 61bffdd commit b75d262

24 files changed

+578
-140
lines changed

‎.github/workflows/backwards_compatibility.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
backend-version: "25.1"
4646

4747
steps:
48-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
48+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
4949
with:
5050
persist-credentials: false
5151

@@ -166,7 +166,7 @@ jobs:
166166
backend-version: "25.2"
167167
windows-runner: "windows-2025"
168168
steps:
169-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
169+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
170170
with:
171171
persist-credentials: false
172172

‎.github/workflows/ci_cd.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ jobs:
208208
Write-Output "SKIP_UNSTABLE=$Result" | Out-File -FilePath $env:GITHUB_ENV -Append
209209
Write-Output "SKIP_UNSTABLE will be: $Result"
210210
211-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
211+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
212212
if: env.SKIP_UNSTABLE == 'false'
213213
with:
214214
persist-credentials: false
@@ -425,7 +425,7 @@ jobs:
425425
426426
- name: Checkout repository
427427
if: env.SKIP_UNSTABLE == 'false'
428-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
428+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
429429
with:
430430
persist-credentials: false
431431

@@ -505,7 +505,7 @@ jobs:
505505
password: ${{ secrets.GITHUB_TOKEN }}
506506

507507
- name: Checkout repository
508-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
508+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
509509
with:
510510
persist-credentials: false
511511

@@ -557,7 +557,7 @@ jobs:
557557
password: ${{ secrets.GITHUB_TOKEN }}
558558

559559
- name: Checkout repository
560-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
560+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
561561
with:
562562
persist-credentials: false
563563

@@ -626,7 +626,7 @@ jobs:
626626

627627
steps:
628628
- name: Check out repository pyansys-geometry-binaries
629-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
629+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
630630
with:
631631
repository: 'ansys/pyansys-geometry-binaries'
632632
token: ${{ secrets.BINARIES_TOKEN }}
@@ -705,7 +705,7 @@ jobs:
705705
zip-file: "windows-core-binaries.zip"
706706
steps:
707707
- name: Checkout repository
708-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
708+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
709709
with:
710710
persist-credentials: false
711711

@@ -817,7 +817,7 @@ jobs:
817817
needs: [fetch-release-artifacts]
818818
steps:
819819
- name: Checkout repository
820-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
820+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
821821
with:
822822
persist-credentials: false
823823

‎.github/workflows/codeql.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
security-events: write
2222
steps:
2323
- name: Checkout repository
24-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
24+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
2525
with:
2626
persist-credentials: false
2727

‎.github/workflows/label.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
contents: write
2626
pull-requests: write
2727
steps:
28-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
28+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
2929
with:
3030
persist-credentials: false
3131
- uses: micnncim/action-label-syncer@3abd5ab72fda571e69fffd97bd4e0033dd5f495c # v1.3.0

‎.github/workflows/nightly_docker_test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100
contents: read
101101
packages: read
102102
steps:
103-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
103+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
104104
with:
105105
persist-credentials: false
106106

‎.github/workflows/v1_testing.yml‎

Lines changed: 160 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,160 @@
1+
name: v1 Protos Testing
2+
on:
3+
workflow_dispatch:
4+
5+
env:
6+
MAIN_PYTHON_VERSION: '3.13'
7+
ANSRV_GEO_IMAGE: 'ghcr.io/ansys/geometry'
8+
ANSRV_GEO_PORT: 700
9+
ANSRV_GEO_LICENSE_SERVER: ${{ secrets.LICENSE_SERVER }}
10+
GEO_CONT_NAME: ans_geo
11+
RESET_IMAGE_CACHE: 0
12+
13+
permissions:
14+
contents: read
15+
packages: read
16+
17+
jobs:
18+
testing-windows-v1:
19+
name: Testing and coverage (Windows - v1 Protos)
20+
runs-on: windows-latest
21+
strategy:
22+
fail-fast: false
23+
matrix:
24+
python-version: ['3.10', '3.13']
25+
26+
steps:
27+
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
28+
with:
29+
persist-credentials: false
30+
31+
- name: Set up Python
32+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
33+
with:
34+
python-version: ${{ matrix.python-version }}
35+
36+
- name: Set up headless display
37+
uses: pyvista/setup-headless-display-action@7d84ae825e6d9297a8e99bdbbae20d1b919a0b19 # v4.2
38+
39+
- name: Install packages for testing
40+
run: |
41+
python -m pip install --upgrade pip
42+
pip install --upgrade build wheel
43+
pip install -e . --group tests
44+
45+
- name: Login to GitHub Container Registry
46+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
47+
with:
48+
registry: ghcr.io
49+
username: ${{ github.actor }}
50+
password: ${{ secrets.GITHUB_TOKEN }}
51+
52+
- name: Download Geometry service container (if needed)
53+
env:
54+
FULL_IMAGE_NAME: "${{ env.ANSRV_GEO_IMAGE }}:core-windows-latest"
55+
run: |
56+
Write-Host "Pulling Docker image: $env:FULL_IMAGE_NAME"
57+
docker pull $env:FULL_IMAGE_NAME
58+
59+
- name: Start Geometry service and verify start
60+
env:
61+
FULL_IMAGE_NAME: "${{ env.ANSRV_GEO_IMAGE }}:core-windows-latest"
62+
PORT_MAPPING: "${{ env.ANSRV_GEO_PORT }}:50051"
63+
TRANSPORT_MODE_SELECTION: ${{ secrets.TRANSPORT_MODE_SELECTION }}
64+
run: |
65+
# Write command to file launch.txt for sanitizing purposes
66+
echo "docker run --detach --name $env:GEO_CONT_NAME -e LICENSE_SERVER=$env:ANSRV_GEO_LICENSE_SERVER -p $env:PORT_MAPPING $env:FULL_IMAGE_NAME $env:TRANSPORT_MODE_SELECTION" | Out-File -FilePath launch.txt
67+
# Read the file and execute the command
68+
$command = Get-Content -Path launch.txt | Select-String -Pattern "docker run"
69+
Invoke-Expression $command.Line
70+
Start-Sleep -Seconds 10
71+
python -c "from ansys.geometry.core.connection.validate import validate; validate()"
72+
73+
- name: Restore images cache
74+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
75+
with:
76+
path: .\tests\integration\image_cache
77+
key: pyvista-image-cache-${{ runner.os }}-v-${{ env.RESET_IMAGE_CACHE }}-${{ hashFiles('pyproject.toml') }}
78+
restore-keys: pyvista-image-cache-${{ runner.os }}-v-${{ env.RESET_IMAGE_CACHE }}
79+
lookup-only: true
80+
81+
- name: Testing
82+
timeout-minutes: 20 # Sometimes hangs...
83+
run: |
84+
pytest -v --proto-version=v1
85+
86+
- name: Stop the Geometry service
87+
if: always()
88+
run: |
89+
docker stop $env:GEO_CONT_NAME
90+
docker logs $env:GEO_CONT_NAME
91+
docker rm $env:GEO_CONT_NAME
92+
93+
testing-linux-v1:
94+
name: Testing and coverage (Linux - v1 Protos)
95+
runs-on: ubuntu-latest
96+
strategy:
97+
fail-fast: false
98+
matrix:
99+
python-version: ['3.10', '3.13']
100+
101+
steps:
102+
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
103+
with:
104+
persist-credentials: false
105+
106+
- name: Set up Python
107+
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
108+
with:
109+
python-version: ${{ matrix.python-version }}
110+
111+
- name: Set up headless display
112+
uses: pyvista/setup-headless-display-action@7d84ae825e6d9297a8e99bdbbae20d1b919a0b19 # v4.2
113+
114+
- name: Install packages for testing
115+
run: |
116+
python -m pip install --upgrade pip
117+
pip install --upgrade build wheel
118+
pip install -e . --group tests
119+
120+
- name: Login to GitHub Container Registry
121+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
122+
with:
123+
registry: ghcr.io
124+
username: ${{ github.actor }}
125+
password: ${{ secrets.GITHUB_TOKEN }}
126+
127+
- name: Download Geometry service container (if needed)
128+
env:
129+
FULL_IMAGE_NAME: "${{ env.ANSRV_GEO_IMAGE }}:core-linux-latest"
130+
run: |
131+
echo "Pulling Docker image: ${FULL_IMAGE_NAME}"
132+
docker pull ${FULL_IMAGE_NAME}
133+
134+
- name: Start Geometry service and verify start
135+
env:
136+
FULL_IMAGE_NAME: "${{ env.ANSRV_GEO_IMAGE }}:core-linux-latest"
137+
TRANSPORT_MODE_SELECTION: ${{ secrets.TRANSPORT_MODE_SELECTION }}
138+
run: |
139+
docker run --detach --name ${GEO_CONT_NAME} -e LICENSE_SERVER=${ANSRV_GEO_LICENSE_SERVER} -p ${ANSRV_GEO_PORT}:50051 ${FULL_IMAGE_NAME} ${TRANSPORT_MODE_SELECTION}
140+
python -c "from ansys.geometry.core.connection.validate import validate; validate()"
141+
142+
- name: Restore images cache
143+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
144+
with:
145+
path: tests/integration/image_cache
146+
key: pyvista-image-cache-${{ runner.os }}-v-${{ env.RESET_IMAGE_CACHE }}-${{ hashFiles('pyproject.toml') }}
147+
restore-keys: pyvista-image-cache-${{ runner.os }}-v-${{ env.RESET_IMAGE_CACHE }}
148+
lookup-only: true
149+
150+
- name: Testing
151+
timeout-minutes: 20 # Sometimes hangs...
152+
run: |
153+
pytest -v --proto-version=v1
154+
155+
- name: Stop the Geometry service
156+
if: always()
157+
run: |
158+
docker stop ${GEO_CONT_NAME}
159+
docker logs ${GEO_CONT_NAME}
160+
docker rm ${GEO_CONT_NAME}

‎doc/changelog.d/2389.maintenance.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Adding testing for v1 protos

‎doc/changelog.d/2391.maintenance.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
V1 implementation of admin and assembly condition stubs

‎doc/changelog.d/2393.maintenance.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Bump actions/checkout from 5.0.1 to 6.0.0 in the actions group

‎doc/changelog.d/2395.maintenance.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Dbu application to commands script v1

0 commit comments

Comments
 (0)