feat: adapt CI/CD to new machine (#647)

ansys · Aug 9, 2023 · d77b85b · d77b85b
1 parent b1e0f76
commit d77b85b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 22 deletions.
diff --git a/.github/workflows/ci_cd.yml b/.github/workflows/ci_cd.yml
@@ -85,6 +85,7 @@ jobs:
             experimental: true
 
     steps:
+
       - uses: actions/checkout@v3
 
       - name: Set up Python
@@ -118,7 +119,7 @@ jobs:
         run: docker pull ${{ env.ANSRV_GEO_IMAGE }}:${{ matrix.docker-image }}
 
       - name: Check location of self-hosted runner and define license server accordingly
-        if: runner.name == 'pygeometry-ci-1'
+        if: runner.name == 'pygeometry-ci-1' || runner.name == 'pygeometry-ci-2'
         run:
           echo "ANSRV_GEO_LICENSE_SERVER=${{ secrets.INTERNAL_LICENSE_SERVER }}" | Out-File -FilePath $env:GITHUB_ENV -Append
 
@@ -132,8 +133,8 @@ jobs:
         uses: actions/cache@v3
         with:
           path: .\tests\integration\image_cache
-          key: pyvista-image-cache-${{ runner.os }}-v-${{ env.RESET_IMAGE_CACHE }}-${{ hashFiles('pyproject.toml') }}
-          restore-keys: pyvista-image-cache-${{ runner.os }}-v-${{ env.RESET_IMAGE_CACHE }}
+          key: pyvista-image-cache-${{ runner.name }}-v-${{ env.RESET_IMAGE_CACHE }}-${{ hashFiles('pyproject.toml') }}
+          restore-keys: pyvista-image-cache-${{ runner.name }}-v-${{ env.RESET_IMAGE_CACHE }}
 
       - name: Testing
         run: |
@@ -144,15 +145,15 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v3
         with:
-          name: integration-test-logs-${{ runner.os }}
+          name: integration-test-logs-${{ matrix.docker-image }}
           path: tests/integration/logs
           retention-days: 7
 
       - name: Upload PyVista generated images (cache and results)
         if: always()
         uses: actions/upload-artifact@v3
         with:
-          name: pytest-pyvista-images-${{ runner.os }}
+          name: pytest-pyvista-images-${{ matrix.docker-image }}
           path: tests/integration/image_cache
           retention-days: 7
 
@@ -221,7 +222,7 @@ jobs:
         run: docker pull $env:ANSRV_GEO_IMAGE_WINDOWS_TAG
 
       - name: Check location of self-hosted runner and define license server accordingly
-        if: runner.name == 'pygeometry-ci-1'
+        if: runner.name == 'pygeometry-ci-1' || runner.name == 'pygeometry-ci-2'
         run:
           echo "ANSRV_GEO_LICENSE_SERVER=${{ secrets.INTERNAL_LICENSE_SERVER }}" | Out-File -FilePath $env:GITHUB_ENV -Append
 
@@ -303,7 +304,6 @@ jobs:
         run: |
           docker pull ${{ env.ANSRV_GEO_IMAGE }}:${{ matrix.docker-image }}
           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 }}:${{ matrix.docker-image }}
-
       - name: Checkout repository
         uses: actions/checkout@v3
 
@@ -327,15 +327,15 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v3
         with:
-          name: integration-test-logs-${{ runner.os }}
+          name: integration-test-logs-${{ matrix.docker-image }}
           path: tests/integration/logs
           retention-days: 7
 
       - name: Upload PyVista generated images (cache and results)
         if: always()
         uses: actions/upload-artifact@v3
         with:
-          name: pytest-pyvista-images-${{ runner.os }}
+          name: pytest-pyvista-images-${{ matrix.docker-image }}
           path: tests/integration/image_cache
           retention-days: 7
 

diff --git a/.github/workflows/docker_test_build.yml b/.github/workflows/docker_test_build.yml
@@ -1,18 +1,7 @@
 name: Docker images - Test build
 on:
   workflow_dispatch:
-  pull_request:
-    paths:
-      - 'docker/**'
-      - '.github/workflows/docker_test_build.yml'
-  push:
-    branches:
-      - main
-    paths:
-      - 'docker/**'
-      - '.github/workflows/docker_test_build.yml'
   release:
-    types: [published]
 
 env:
   MAIN_PYTHON_VERSION: '3.10'
@@ -58,7 +47,7 @@ jobs:
           docker build -f Dockerfile.windows -t ${{ env.ANSRV_GEO_IMAGE_WINDOWS_TAG }} .
 
       - name: Check location of self-hosted runner and define license server accordingly
-        if: runner.name == 'pygeometry-ci-1'
+        if: runner.name == 'pygeometry-ci-1' || runner.name == 'pygeometry-ci-2'
         run:
           echo "ANSRV_GEO_LICENSE_SERVER=${{ secrets.INTERNAL_LICENSE_SERVER }}" | Out-File -FilePath $env:GITHUB_ENV -Append
 

diff --git a/.github/workflows/nightly_docker_test.yml b/.github/workflows/nightly_docker_test.yml
@@ -63,7 +63,7 @@ jobs:
           docker pull $env:ANSRV_GEO_IMAGE_WINDOWS_TAG
 
       - name: Check location of self-hosted runner and define license server accordingly
-        if: runner.name == 'pygeometry-ci-1'
+        if: runner.name == 'pygeometry-ci-1' || runner.name == 'pygeometry-ci-2'
         run:
           echo "ANSRV_GEO_LICENSE_SERVER=${{ secrets.INTERNAL_LICENSE_SERVER }}" | Out-File -FilePath $env:GITHUB_ENV -Append