Skip to content

Commit a1c7e6a

Browse files
RobPasMueRobPasMue
committed
ci: change to core-services and use 25.2 as latest
1 parent 5b1647c commit a1c7e6a

File tree

11 files changed

+56
-45
lines changed

11 files changed

+56
-45
lines changed

‎.github/workflows/ci_cd.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ env:
1313
PACKAGE_NAME: 'ansys-geometry-core'
1414
DOCUMENTATION_CNAME: 'geometry.docs.pyansys.com'
1515
ANSRV_GEO_IMAGE: 'ghcr.io/ansys/geometry'
16-
ANSRV_GEO_IMAGE_WINDOWS_TAG: ghcr.io/ansys/geometry:windows-latest
16+
ANSRV_GEO_IMAGE_WINDOWS_TAG: ghcr.io/ansys/geometry:core-windows-latest
1717
ANSRV_GEO_PORT: 700
1818
ANSRV_GEO_LICENSE_SERVER: ${{ secrets.LICENSE_SERVER }}
1919
GEO_CONT_NAME: ans_geo
2020
RESET_IMAGE_CACHE: 4
2121
IS_WORKFLOW_RUNNING: True
22-
ARTIFACTORY_VERSION: v251
22+
ARTIFACTORY_VERSION: v252
2323

2424
concurrency:
2525
group: ${{ github.workflow }}-${{ github.ref }}
@@ -118,9 +118,9 @@ jobs:
118118
fail-fast: false
119119
matrix:
120120
include:
121-
- docker-image: "windows-latest"
121+
- docker-image: "core-windows-latest"
122122
experimental: false
123-
- docker-image: "windows-latest-unstable"
123+
- docker-image: "core-windows-latest-unstable"
124124
experimental: true
125125

126126
steps:
@@ -226,7 +226,7 @@ jobs:
226226

227227
- name: Upload coverage to Codecov
228228
uses: codecov/codecov-action@v5
229-
if: matrix.docker-image == 'windows-latest'
229+
if: matrix.docker-image == 'core-windows-latest'
230230
env:
231231
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
232232
with:
@@ -331,9 +331,9 @@ jobs:
331331
fail-fast: false
332332
matrix:
333333
include:
334-
- docker-image: "linux-latest"
334+
- docker-image: "core-linux-latest"
335335
experimental: false
336-
- docker-image: "linux-latest-unstable"
336+
- docker-image: "core-linux-latest-unstable"
337337
experimental: true
338338

339339
steps:
@@ -403,7 +403,7 @@ jobs:
403403
needs: [smoke-tests]
404404
runs-on: ubuntu-latest
405405
env:
406-
ANSRV_GEO_IMAGE_MINREQS: 'ghcr.io/ansys/geometry:linux-latest'
406+
ANSRV_GEO_IMAGE_MINREQS: 'ghcr.io/ansys/geometry:core-linux-latest'
407407
strategy:
408408
fail-fast: false
409409
matrix:
@@ -481,8 +481,8 @@ jobs:
481481
- name: Download binaries (if conditions met)
482482
if: env.REUSE_LAST_ARTIFACTS == 'false'
483483
run: |
484-
curl.exe -X GET -H "X-JFrog-Art-Api: ${{ secrets.ARTIFACTORY_KEY }}" ${{ secrets.ARTIFACTORY_URL }}/${{ env.ARTIFACTORY_VERSION }}/DockerWindows.zip --output windows-binaries.zip
485-
curl.exe -X GET -H "X-JFrog-Art-Api: ${{ secrets.ARTIFACTORY_KEY }}" ${{ secrets.ARTIFACTORY_URL }}/${{ env.ARTIFACTORY_VERSION }}/DockerLinux.zip --output linux-binaries.zip
484+
curl.exe -X GET -H "X-JFrog-Art-Api: ${{ secrets.ARTIFACTORY_KEY }}" ${{ secrets.ARTIFACTORY_URL }}/${{ env.ARTIFACTORY_VERSION }}/DockerCoreWindows.zip --output windows-binaries.zip
485+
curl.exe -X GET -H "X-JFrog-Art-Api: ${{ secrets.ARTIFACTORY_KEY }}" ${{ secrets.ARTIFACTORY_URL }}/${{ env.ARTIFACTORY_VERSION }}/DockerCoreLinux.zip --output linux-binaries.zip
486486
487487
- name: Reuse last binaries (if conditions met)
488488
if: env.REUSE_LAST_ARTIFACTS == 'true'
@@ -555,7 +555,7 @@ jobs:
555555
- name: Build Docker image
556556
working-directory: docker
557557
run: |
558-
docker build -f windows/Dockerfile -t ghcr.io/ansys/geometry:windows-latest-tmp .
558+
docker build -f windows/Dockerfile -t ghcr.io/ansys/geometry:core-windows-latest-tmp .
559559
560560
- name: Check location of self-hosted runner and define license server accordingly
561561
if: runner.name == 'pygeometry-ci-2'
@@ -564,7 +564,7 @@ jobs:
564564

565565
- name: Launch Geometry service
566566
run: |
567-
docker run --detach --name ${{ env.GEO_CONT_NAME }} -e LICENSE_SERVER=${{ env.ANSRV_GEO_LICENSE_SERVER }} -p ${{ env.ANSRV_GEO_PORT }}:50051 ghcr.io/ansys/geometry:windows-latest-tmp
567+
docker run --detach --name ${{ env.GEO_CONT_NAME }} -e LICENSE_SERVER=${{ env.ANSRV_GEO_LICENSE_SERVER }} -p ${{ env.ANSRV_GEO_PORT }}:50051 ghcr.io/ansys/geometry:core-windows-latest-tmp
568568
569569
- name: Validate connection using PyAnsys Geometry
570570
run: |
@@ -618,7 +618,7 @@ jobs:
618618
- name: Delete the Docker images (and untagged ones)
619619
if: always()
620620
run: |
621-
docker image rm ghcr.io/ansys/geometry:windows-latest-tmp
621+
docker image rm ghcr.io/ansys/geometry:core-windows-latest-tmp
622622
docker system prune -f
623623
624624
# =================================================================================================
@@ -647,11 +647,11 @@ jobs:
647647
- name: Build Docker image
648648
working-directory: docker
649649
run: |
650-
docker build -f linux/Dockerfile -t ghcr.io/ansys/geometry:linux-latest-tmp .
650+
docker build -f linux/Dockerfile -t ghcr.io/ansys/geometry:core-linux-latest-tmp .
651651
652652
- name: Launch Geometry service
653653
run: |
654-
docker run --detach --name ${{ env.GEO_CONT_NAME }} -e LICENSE_SERVER=${{ env.ANSRV_GEO_LICENSE_SERVER }} -p ${{ env.ANSRV_GEO_PORT }}:50051 ghcr.io/ansys/geometry:linux-latest-tmp
654+
docker run --detach --name ${{ env.GEO_CONT_NAME }} -e LICENSE_SERVER=${{ env.ANSRV_GEO_LICENSE_SERVER }} -p ${{ env.ANSRV_GEO_PORT }}:50051 ghcr.io/ansys/geometry:core-linux-latest-tmp
655655
656656
- name: Validate connection using PyAnsys Geometry
657657
run: |

‎.github/workflows/docker_ansyslab_linux.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ permissions:
1212
packages: read
1313

1414
env:
15-
LINUX_STABLE_GHCR: ghcr.io/ansys/geometry:linux-latest
15+
LINUX_STABLE_GHCR: ghcr.io/ansys/geometry:core-linux-latest
1616
LINUX_STABLE_FUJI: azwepsifujiaksacr.azurecr.io/ansys/discovery/geometry:linux-latest
1717

1818
jobs:

‎.github/workflows/docker_ansyslab_windows.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ permissions:
1212
packages: read
1313

1414
env:
15-
WINDOWS_STABLE_GHCR: ghcr.io/ansys/geometry:windows-latest
15+
WINDOWS_STABLE_GHCR: ghcr.io/ansys/geometry:core-windows-latest
1616
WINDOWS_STABLE_FUJI: azwepsifujiaksacr.azurecr.io/ansys/discovery/geometry:windows-latest
1717

1818
jobs:

‎.github/workflows/docker_cleanup.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ jobs:
2626
with:
2727
package-name: 'geometry'
2828
token: ${{ secrets.GITHUB_TOKEN }}
29-
tags-kept: 'windows-latest, windows-latest-unstable, windows-coreservice, windows-coreservice-unstable, linux-latest, linux-latest-unstable, 24.1, 24.2, 25.1, windows-24.1, windows-24.2, windows-25.1, linux-24.1, linux-24.2, linux-25.1'
29+
tags-kept: 'core-windows-latest, core-windows-latest-unstable, windows-latest, windows-latest-unstable, core-linux-latest, core-linux-latest-unstable, linux-latest, linux-latest-unstable, 24.1, 24.2, 25.1, windows-24.1, windows-24.2, windows-25.1, core-windows-25.2, linux-24.1, linux-24.2, linux-25.1, core-linux-25.2'

‎.github/workflows/docker_push_stable.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ on:
88
default: 'all'
99
type: choice
1010
options:
11-
- windows-latest
12-
- linux-latest
11+
- core-windows-latest
12+
- core-linux-latest
1313
- all
1414

1515
ansyslab:
@@ -24,16 +24,16 @@ permissions:
2424
packages: write
2525

2626
env:
27-
WINDOWS_UNSTABLE: ghcr.io/ansys/geometry:windows-latest-unstable
28-
WINDOWS_STABLE_GHCR: ghcr.io/ansys/geometry:windows-latest
29-
LINUX_UNSTABLE: ghcr.io/ansys/geometry:linux-latest-unstable
30-
LINUX_STABLE_GHCR: ghcr.io/ansys/geometry:linux-latest
27+
WINDOWS_UNSTABLE: ghcr.io/ansys/geometry:core-windows-latest-unstable
28+
WINDOWS_STABLE_GHCR: ghcr.io/ansys/geometry:core-windows-latest
29+
LINUX_UNSTABLE: ghcr.io/ansys/geometry:core-linux-latest-unstable
30+
LINUX_STABLE_GHCR: ghcr.io/ansys/geometry:core-linux-latest
3131

3232
jobs:
3333
windows:
3434
name: Publish Windows latest image
3535
runs-on: windows-latest
36-
if: inputs.images == 'all' || inputs.images == 'windows-latest'
36+
if: inputs.images == 'all' || inputs.images == 'core-windows-latest'
3737
steps:
3838
- name: Login in Github Container registry
3939
uses: docker/login-action@v3
@@ -61,7 +61,7 @@ jobs:
6161
linux:
6262
name: Publish Linux latest image
6363
runs-on: ubuntu-latest
64-
if: inputs.images == 'all' || inputs.images == 'linux-latest'
64+
if: inputs.images == 'all' || inputs.images == 'core-linux-latest'
6565
steps:
6666
- name: Login in Github Container registry
6767
uses: docker/login-action@v3

‎.github/workflows/nightly_docker_test.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ on:
2222

2323
env:
2424
MAIN_PYTHON_VERSION: '3.13'
25-
ANSRV_GEO_IMAGE_WINDOWS_TAG: ghcr.io/ansys/geometry:windows-latest-unstable
26-
ANSRV_GEO_IMAGE_LINUX_TAG: ghcr.io/ansys/geometry:linux-latest-unstable
25+
ANSRV_GEO_IMAGE_WINDOWS_TAG: ghcr.io/ansys/geometry:core-windows-latest-unstable
26+
ANSRV_GEO_IMAGE_LINUX_TAG: ghcr.io/ansys/geometry:core-linux-latest-unstable
2727
ANSRV_GEO_PORT: 710
2828
ANSRV_GEO_LICENSE_SERVER: ${{ secrets.LICENSE_SERVER }}
2929
GEO_CONT_NAME: ans_geo_nightly
@@ -213,8 +213,8 @@ jobs:
213213
name: Promote Windows container
214214
if: ${{ github.event.inputs.promote == 'true' || github.event_name == 'schedule' }}
215215
env:
216-
WINDOWS_UNSTABLE: ghcr.io/ansys/geometry:windows-latest-unstable
217-
WINDOWS_STABLE_GHCR: ghcr.io/ansys/geometry:windows-latest
216+
WINDOWS_UNSTABLE: ghcr.io/ansys/geometry:core-windows-latest-unstable
217+
WINDOWS_STABLE_GHCR: ghcr.io/ansys/geometry:core-windows-latest
218218
steps:
219219
- name: Login in Github Container registry
220220
uses: docker/login-action@v3
@@ -238,8 +238,8 @@ jobs:
238238
name: Promote Linux container
239239
if: ${{ github.event.inputs.promote == 'true' || github.event_name == 'schedule' }}
240240
env:
241-
LINUX_UNSTABLE: ghcr.io/ansys/geometry:linux-latest-unstable
242-
LINUX_STABLE_GHCR: ghcr.io/ansys/geometry:linux-latest
241+
LINUX_UNSTABLE: ghcr.io/ansys/geometry:core-linux-latest-unstable
242+
LINUX_STABLE_GHCR: ghcr.io/ansys/geometry:core-linux-latest
243243
steps:
244244
- name: Login in Github Container registry
245245
uses: docker/login-action@v3

‎doc/source/getting_started/docker/windows_container.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ container for the Geometry service and install this image.
8585

8686
.. code:: bash
8787
88-
docker pull ghcr.io/ansys/geometry:windows-latest
88+
docker pull ghcr.io/ansys/geometry:core-windows-latest
8989
9090
.. _ref_windows_docker_fromscratch:
9191

@@ -173,7 +173,7 @@ To build your image, follow these instructions:
173173

174174
.. code:: bash
175175
176-
docker build -t ghcr.io/ansys/geometry:windows-latest -f windows/Dockerfile .
176+
docker build -t ghcr.io/ansys/geometry:core-windows-latest -f windows/Dockerfile .
177177
178178
#. Check that the image has been created successfully. You should see output similar
179179
to this:

‎docker/build_docker_windows.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
# Build the docker image
144144
print(">>> Building docker image. This might take some time...")
145145
out = subprocess.run(
146-
["docker", "build", "-t", "ghcr.io/ansys/geometry:windows-latest", "."],
146+
["docker", "build", "-t", "ghcr.io/ansys/geometry:core-windows-latest", "."],
147147
cwd=TMP_DIR,
148148
capture_output=True,
149149
)

‎docker/windows/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ENV LICENSE_SERVER=""
2929
ENV SERVER_ENDPOINT="0.0.0.0:50051"
3030
ENV ENABLE_TRACE=0
3131
ENV LOG_LEVEL=2
32-
ENV AWP_ROOT251=C:/app/unified
32+
ENV AWP_ROOT252=C:/app/unified
3333

3434
# Add container labels
3535
LABEL org.opencontainers.image.authors="ANSYS Inc."

‎src/ansys/geometry/core/connection/backend.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ class ApiVersions(Enum):
4444
V_232 = 232
4545
V_241 = 241
4646
V_242 = 242
47-
V_251 = LATEST = 251
47+
V_251 = 251
48+
V_252 = LATEST = 252
4849

4950
@staticmethod
5051
def parse_input(version: Union[int, str, "ApiVersions"]) -> "ApiVersions":

0 commit comments

Comments
 (0)