Skip to content

Commit b015518

Browse files
committed
ci: aligning
1 parent ce9983c commit b015518

File tree

3 files changed

+21
-14
lines changed

3 files changed

+21
-14
lines changed

.github/workflows/backwards_compatibility.yml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -113,22 +113,14 @@ jobs:
113113
TRANSPORT_MODE_SELECTION: ${{ secrets.TRANSPORT_MODE_SELECTION }}
114114
run: |
115115
.\.venv\Scripts\Activate.ps1
116-
# Write command to file dbug.txt for debugging purposes
117-
echo "docker run --detach --name $env:GEO_CONT_NAME -e LICENSE_SERVER=$env:ANSRV_GEO_LICENSE_SERVER $env:SERVER_ENDPOINT -p $env:PORT_MAPPING $env:FULL_IMAGE_NAME $env:TRANSPORT_MODE_SELECTION" | Out-File -FilePath dbug.txt -Append
116+
# Write command to file launch.txt for sanitizing purposes
117+
echo "docker run --detach --name $env:GEO_CONT_NAME -e LICENSE_SERVER=$env:ANSRV_GEO_LICENSE_SERVER $env:SERVER_ENDPOINT -p $env:PORT_MAPPING $env:FULL_IMAGE_NAME $env:TRANSPORT_MODE_SELECTION" | Out-File -FilePath launch.txt -Append
118118
# Read the file and execute the command
119-
$command = Get-Content -Path dbug.txt | Select-String -Pattern "docker run"
119+
$command = Get-Content -Path launch.txt | Select-String -Pattern "docker run"
120120
Invoke-Expression $command.Line
121121
Start-Sleep -Seconds 10
122122
python -c "from ansys.geometry.core.connection.validate import validate; validate()"
123123
124-
- name: Upload file (even if failure)
125-
if: always()
126-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
127-
with:
128-
name: dbug.txt-${{ matrix.backend-version }}
129-
path: dbug.txt
130-
retention-days: 1
131-
132124
- name: Testing
133125
timeout-minutes: 20 # On Windows self-hosted runners, sometimes hangs...
134126
env:

.github/workflows/ci_cd.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,12 @@ jobs:
281281
TRANSPORT_MODE_SELECTION: ${{ secrets.TRANSPORT_MODE_SELECTION }}
282282
run: |
283283
.\.venv\Scripts\Activate.ps1
284-
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
284+
# Write command to file launch.txt for sanitizing purposes
285+
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 -Append
286+
# Read the file and execute the command
287+
$command = Get-Content -Path launch.txt | Select-String -Pattern "docker run"
288+
Invoke-Expression $command.Line
289+
Start-Sleep -Seconds 10
285290
python -c "from ansys.geometry.core.connection.validate import validate; validate()"
286291
287292
- name: Restore images cache
@@ -850,7 +855,12 @@ jobs:
850855
PORT_MAPPING: "${{ env.ANSRV_GEO_PORT }}:50051"
851856
run: |
852857
.\.venv\Scripts\Activate.ps1
853-
docker run --detach --name $env:GEO_CONT_NAME -e LICENSE_SERVER=$env:ANSRV_GEO_LICENSE_SERVER -p $env:PORT_MAPPING ghcr.io/ansys/geometry:windows-tmp $env:TRANSPORT_MODE_SELECTION
858+
# Write command to file launch.txt for sanitizing purposes
859+
echo "docker run --detach --name $env:GEO_CONT_NAME -e LICENSE_SERVER=$env:ANSRV_GEO_LICENSE_SERVER -p $env:PORT_MAPPING ghcr.io/ansys/geometry:windows-tmp $env:TRANSPORT_MODE_SELECTION" | Out-File -FilePath launch.txt -Append
860+
# Read the file and execute the command
861+
$command = Get-Content -Path launch.txt | Select-String -Pattern "docker run"
862+
Invoke-Expression $command.Line
863+
Start-Sleep -Seconds 10
854864
python -c "from ansys.geometry.core.connection.validate import validate; validate()"
855865
856866
- name: Testing

.github/workflows/nightly_docker_test.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,12 @@ jobs:
153153
PORT_MAPPING: "${{ env.ANSRV_GEO_PORT }}:50051"
154154
run: |
155155
.\.venv\Scripts\Activate.ps1
156-
docker run --detach --name $env:GEO_CONT_NAME -e LICENSE_SERVER=$env:ANSRV_GEO_LICENSE_SERVER -p $env:PORT_MAPPING $env:ANSRV_GEO_IMAGE_WINDOWS_CORE_TAG $env:TRANSPORT_MODE_SELECTION
156+
# Write command to file launch.txt for sanitizing purposes
157+
echo "docker run --detach --name $env:GEO_CONT_NAME -e LICENSE_SERVER=$env:ANSRV_GEO_LICENSE_SERVER -p $env:PORT_MAPPING $env:ANSRV_GEO_IMAGE_WINDOWS_CORE_TAG $env:TRANSPORT_MODE_SELECTION" | Out-File -FilePath launch.txt -Append
158+
# Read the file and execute the command
159+
$command = Get-Content -Path launch.txt | Select-String -Pattern "docker run"
160+
Invoke-Expression $command.Line
161+
Start-Sleep -Seconds 10
157162
python -c "from ansys.geometry.core.connection.validate import validate; validate()"
158163
159164
- name: Run PyAnsys Geometry tests

0 commit comments

Comments
 (0)