Use same gdal install command for post merge (#4008)

Also add oc command for cleanup scripts.
bcgov · Oct 15, 2024 · 71e17bb · 71e17bb
1 parent 9d5cd7b
commit 71e17bb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml
@@ -19,6 +19,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Install OpenShift CLI tools
+        uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: "4.14"
+
       - name: Clean up - dev (OCP4)
         shell: bash
         run: |
@@ -50,6 +55,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Install OpenShift CLI tools
+        uses: redhat-actions/openshift-tools-installer@v1
+        with:
+          oc: "4.14"
+
       - name: Clean up dev database
         shell: bash
         run: |

diff --git a/.github/workflows/post_merge_integration.yml b/.github/workflows/post_merge_integration.yml
@@ -66,7 +66,7 @@ jobs:
         run: |
           poetry run python -m pip install --upgrade pip
           poetry install
-          poetry run python -m pip install gdal==$(gdal-config --version)
+          poetry run python -m pip install --no-build-isolation --no-cache-dir --force-reinstall gdal==$(gdal-config --version)
       - name: Lint (api)
         # We used to be able to do linting before installing gdal, but it's not possible anymore.
         # We can however place it ahead of the R installs.
@@ -141,7 +141,7 @@ jobs:
         run: |
           poetry run python -m pip install --upgrade pip
           poetry install
-          poetry run python -m pip install gdal==$(gdal-config --version)
+          poetry run python -m pip install --no-build-isolation --no-cache-dir --force-reinstall gdal==$(gdal-config --version)
       - uses: r-lib/actions/setup-r@v2
         with:
           r-version: ${{ matrix.R }}