feat: remove hard-coded branch

bcgov · Dec 10, 2024 · 9c825a9 · 9c825a9
1 parent 6908f77
commit 9c825a9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/deploy-to.openshift-dev.yml b/.github/workflows/deploy-to.openshift-dev.yml
@@ -28,7 +28,7 @@ env:
 
   APP_NAME: 'pen-request-api'
   REPO_NAME: "educ-pen-request-api"
-  BRANCH: "master"
+  BRANCH: ${{ github.ref_name }}
   APP_NAME_FULL: "pen-request-api-master"
   NAMESPACE: ${{ secrets.COMMON_NAMESPACE_NO_ENV }}
   COMMON_NAMESPACE: ${{ secrets.COMMON_NAMESPACE_NO_ENV }}
@@ -168,7 +168,7 @@ jobs:
             -p MAX_MEM=${{ env.MAX_MEM }} \
             | oc apply -f -
 
-          curl -s https://raw.githubusercontent.com/bcgov/${{ env.REPO_NAME }}/master/tools/config/update-configmap.sh \
+          curl -s https://raw.githubusercontent.com/bcgov/${{ env.REPO_NAME }}/${{ env.BRANCH }}/tools/config/update-configmap.sh \
             | bash /dev/stdin dev \
             ${{ env.APP_NAME }} \
             ${{ env.NAMESPACE }} \

diff --git a/.github/workflows/deploy-to.openshift-prod.yml b/.github/workflows/deploy-to.openshift-prod.yml
@@ -24,7 +24,7 @@ env:
 
   APP_NAME: 'pen-request-api'
   REPO_NAME: "educ-pen-request-api"
-  BRANCH: "master"
+  BRANCH: ${{ github.ref_name }}
   NAMESPACE: ${{ secrets.COMMON_NAMESPACE_NO_ENV }}
   COMMON_NAMESPACE: ${{ secrets.COMMON_NAMESPACE_NO_ENV }}
   TAG: "latest"

diff --git a/.github/workflows/deploy-to.openshift-test.yml b/.github/workflows/deploy-to.openshift-test.yml
@@ -28,7 +28,7 @@ env:
 
   APP_NAME: 'pen-request-api'
   REPO_NAME: "educ-pen-request-api"
-  BRANCH: "master"
+  BRANCH: "${{ github.ref_name }}"
   APP_NAME_FULL: "pen-request-api-master"
   NAMESPACE: ${{ secrets.COMMON_NAMESPACE_NO_ENV }}
   COMMON_NAMESPACE: ${{ secrets.COMMON_NAMESPACE_NO_ENV }}
@@ -138,7 +138,7 @@ jobs:
             ${{ env.MAX_MEM }} \
             k oc apply -f -
 
-          curl -s https://raw.githubusercontent.com/bcgov/${{ env.REPO_NAME }}/master/tools/config/update-configmap.sh \
+          curl -s https://raw.githubusercontent.com/bcgov/${{ env.REPO_NAME }}/${{ env.BRANCH }}/tools/config/update-configmap.sh \
             | bash /dev/stdin test \
             ${{ env.APP_NAME }} \
             ${{ env.NAMESPACE }} \