From 831b993e100060890f5a990a0987b94039b8bc2a Mon Sep 17 00:00:00 2001
From: Ionwyn Sean <Ionwyn.Sean@gov.bc.ca>
Date: Mon, 16 Dec 2024 15:23:22 -0800
Subject: [PATCH 1/3] Update IsPointWithinServiceArea.xml

---
 .../XmlTemplates/IsPointWithinServiceArea.xml   | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/api/Hmcr.Chris/XmlTemplates/IsPointWithinServiceArea.xml b/api/Hmcr.Chris/XmlTemplates/IsPointWithinServiceArea.xml
index 10834fd1..fb3658f3 100644
--- a/api/Hmcr.Chris/XmlTemplates/IsPointWithinServiceArea.xml
+++ b/api/Hmcr.Chris/XmlTemplates/IsPointWithinServiceArea.xml
@@ -1,13 +1,12 @@
 <wfs:GetFeature service="WFS"
-    version="1.1.0"
-    outputFormat="json"
-    xmlns:topp="http://www.openplans.org/topp"
-    xmlns:wfs="http://www.opengis.net/wfs"
-    xmlns="http://www.opengis.net/ogc"
-    xmlns:gml="http://www.opengis.net/gml"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.opengis.net/wfs
-                        http://schemas.opengis.net/wfs/1.1.0/WFS-basic.xsd">
+  version="1.1.0"
+  outputFormat="json"
+  xmlns:topp="http://www.openplans.org/topp"
+  xmlns:wfs="http://www.opengis.net/wfs"
+  xmlns="http://www.opengis.net/ogc"
+  xmlns:gml="http://www.opengis.net/gml"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.1.0/WFS-basic.xsd">
 
   <wfs:Query typeName="hwy:DSA_CONTRACT_AREA">
     <PropertyName>CONTRACT_AREA_NUMBER</PropertyName>

From e27f5f73fc80fca856fe44bce3ec2c7fa08a63d4 Mon Sep 17 00:00:00 2001
From: Ionwyn Sean <Ionwyn.Sean@gov.bc.ca>
Date: Mon, 16 Dec 2024 15:30:39 -0800
Subject: [PATCH 2/3] Update hmr-build-deploy.yml

---
 .github/workflows/hmr-build-deploy.yml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/hmr-build-deploy.yml b/.github/workflows/hmr-build-deploy.yml
index 61c50c1e..cc41bf95 100644
--- a/.github/workflows/hmr-build-deploy.yml
+++ b/.github/workflows/hmr-build-deploy.yml
@@ -3,7 +3,7 @@ name: hmr-build-deploy
 on:
   pull_request:
     branches:
-      - 'master'
+      - "master"
 
 defaults:
   run:
@@ -30,6 +30,12 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: "12"
+      - name: Install OpenShift CLI
+        run: |
+          curl -LO https://mirror.openshift.com/pub/openshift-v4/clients/oc/latest/linux/oc.tar.gz
+          tar -xzf oc.tar.gz
+          sudo mv oc /usr/local/bin/
+          oc version
       - name: Build
         run: |
           oc version
@@ -84,7 +90,6 @@ jobs:
       run:
         working-directory: ./.pipeline
     steps:
-
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
@@ -114,4 +119,4 @@ jobs:
           oc version
           oc login --token=${{ secrets.OPENSHIFT_TOKEN}} --server=${{ secrets.OPENSHIFT_SERVER_URL }}
           npm ci
-          DEBUG=* npm run deploy -- --pr=${{ github.event.pull_request.number }} --env=prod --git.branch.name=${{github.head_ref}} --git.ref=${{github.head_ref}}
\ No newline at end of file
+          DEBUG=* npm run deploy -- --pr=${{ github.event.pull_request.number }} --env=prod --git.branch.name=${{github.head_ref}} --git.ref=${{github.head_ref}}

From 869dda02841ebd9ebcd0023f12ee7d60b01023ba Mon Sep 17 00:00:00 2001
From: Ionwyn Sean <Ionwyn.Sean@gov.bc.ca>
Date: Mon, 16 Dec 2024 15:48:02 -0800
Subject: [PATCH 3/3] Rollback to ubuntu 22

---
 .github/workflows/hmr-build-deploy.yml | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/hmr-build-deploy.yml b/.github/workflows/hmr-build-deploy.yml
index cc41bf95..efec2ec0 100644
--- a/.github/workflows/hmr-build-deploy.yml
+++ b/.github/workflows/hmr-build-deploy.yml
@@ -11,7 +11,7 @@ defaults:
 
 jobs:
   cancel-previous-runs:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       actions: write
     steps:
@@ -21,7 +21,7 @@ jobs:
           access_token: ${{ github.token }}
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     defaults:
       run:
         working-directory: ./.pipeline
@@ -30,12 +30,6 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: "12"
-      - name: Install OpenShift CLI
-        run: |
-          curl -LO https://mirror.openshift.com/pub/openshift-v4/clients/oc/latest/linux/oc.tar.gz
-          tar -xzf oc.tar.gz
-          sudo mv oc /usr/local/bin/
-          oc version
       - name: Build
         run: |
           oc version
@@ -44,7 +38,7 @@ jobs:
           DEBUG=* npm run build -- --pr=${{ github.event.pull_request.number }} --git.branch.name=${{github.head_ref}} --git.ref=${{github.head_ref}}
 
   deploy-to-dev:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: [build]
     defaults:
       run:
@@ -65,7 +59,7 @@ jobs:
     needs: [build, deploy-to-dev]
     environment:
       name: test
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     defaults:
       run:
         working-directory: ./.pipeline
@@ -85,7 +79,7 @@ jobs:
     needs: [build, deploy-to-test]
     environment:
       name: uat
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     defaults:
       run:
         working-directory: ./.pipeline
@@ -105,7 +99,7 @@ jobs:
     needs: [build, deploy-to-uat]
     environment:
       name: prod
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     defaults:
       run:
         working-directory: ./.pipeline