updates

bcgov · Oct 8, 2024 · 45f21e4 · 45f21e4
1 parent 151c8ce
commit 45f21e4
Show file tree

Hide file tree

Showing 15 changed files with 76 additions and 48 deletions.
diff --git a/.github/workflows/backup-prod-images.yml b/.github/workflows/backup-prod-images.yml
@@ -32,7 +32,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Login to Artifactory 
         uses: docker/login-action@v1
         with:

diff --git a/.github/workflows/build-push-admin-frontend.yml b/.github/workflows/build-push-admin-frontend.yml
@@ -16,10 +16,12 @@ env:
 jobs:
   build:
     runs-on: ubuntu-latest
+    concurrency: $${{ github.ref_name }}-helm
+
     if: github.event_name == 'push'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set environment for branch
         run: |
@@ -112,6 +114,9 @@ jobs:
           git add .
 
           git commit -m "Update ${{ env.BRANCH_NAME }} API image tag"
+
+          # pull any changes
+          git pull origin ${{ env.BRANCH_NAME }}
           git push origin ${{ env.BRANCH_NAME }}  # Update the branch name as needed      
 
 
diff --git a/.github/workflows/build-push-approvalflow.yml b/.github/workflows/build-push-approvalflow.yml
@@ -17,10 +17,12 @@ env:
 jobs:
   build:
     runs-on: ubuntu-latest
+    concurrency: $${{ github.ref_name }}-helm
+
     if: github.event_name == 'push'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set environment for branch
         run: |
@@ -90,9 +92,6 @@ jobs:
           
           # Navigate to the directory containing your Helm values file for the environment develop -> DEV, test -> test
           cd gitops/charts
-
-          # pull any changes
-          git pull origin ${{ env.BRANCH_NAME }}
           
           # Update the Helm values file with the new image tag and version
           DATETIME=$(date +'%Y-%m-%d %H:%M:%S')  # Get current date and time
@@ -118,6 +117,9 @@ jobs:
           git add .
           
           git commit -m "Update ${{ env.BRANCH_NAME }} API image tag"
+
+          # pull any changes
+          git pull origin ${{ env.BRANCH_NAME }}
           git push origin ${{ env.BRANCH_NAME }}  # Update the branch name as needed       
           
 
diff --git a/.github/workflows/build-push-casemanagement.yml b/.github/workflows/build-push-casemanagement.yml
@@ -17,10 +17,12 @@ env:
 jobs:
   build:
     runs-on: ubuntu-latest
+    concurrency: $${{ github.ref_name }}-helm
+
     if: github.event_name == 'push'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set environment for branch
         run: |
@@ -88,9 +90,6 @@ jobs:
           
           # Navigate to the directory containing your Helm values file for the environment develop -> DEV, test -> test
           cd gitops/charts
-
-          # pull any changes
-          git pull origin ${{ env.BRANCH_NAME }}
           
           # Update the Helm values file with the new image tag and version
           DATETIME=$(date +'%Y-%m-%d %H:%M:%S')  # Get current date and time
@@ -116,6 +115,9 @@ jobs:
           git add .
           
           git commit -m "Update ${{ env.BRANCH_NAME }} API image tag"
+
+          # pull any changes
+          git pull origin ${{ env.BRANCH_NAME }}
           git push origin ${{ env.BRANCH_NAME }}  # Update the branch name as needed         
 
 

diff --git a/.github/workflows/build-push-diamconfig.yml b/.github/workflows/build-push-diamconfig.yml
@@ -17,10 +17,12 @@ env:
 jobs:
   build:
     runs-on: ubuntu-latest
+    concurrency: $${{ github.ref_name }}-helm
+
     if: github.event_name == 'push'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set environment for branch
         run: |

diff --git a/.github/workflows/build-push-diamcornet.yml b/.github/workflows/build-push-diamcornet.yml
@@ -17,10 +17,12 @@ env:
 jobs:
   build:
     runs-on: ubuntu-latest
+    concurrency: $${{ github.ref_name }}-helm
+
     if: github.event_name == 'push'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set environment for branch
         run: |
@@ -89,9 +91,6 @@ jobs:
           
           # Navigate to the directory containing your Helm values file for the environment develop -> DEV, test -> test
           cd gitops/charts
-
-          # pull any changes
-          git pull origin ${{ env.BRANCH_NAME }}
           
           # Update the Helm values file with the new image tag and version
           DATETIME=$(date +'%Y-%m-%d %H:%M:%S')  # Get current date and time
@@ -117,4 +116,7 @@ jobs:
           git add .
           
           git commit -m "Update ${{ env.BRANCH_NAME }} API image tag"
+
+          # pull any changes
+          git pull origin ${{ env.BRANCH_NAME }}
           git push origin ${{ env.BRANCH_NAME }}  # Update the branch name as needed        
diff --git a/.github/workflows/build-push-disclosure.yml b/.github/workflows/build-push-disclosure.yml
@@ -17,10 +17,12 @@ env:
 jobs:
   build:
     runs-on: ubuntu-latest
+    concurrency: $${{ github.ref_name }}-helm
+
     if: github.event_name == 'push'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set environment for branch
         run: |
@@ -90,8 +92,6 @@ jobs:
           # Navigate to the directory containing your Helm values file for the environment develop -> DEV, test -> test
           cd gitops/charts
 
-          # pull any changes
-          git pull origin ${{ env.BRANCH_NAME }}
           
           # Update the Helm values file with the new image tag and version
           DATETIME=$(date +'%Y-%m-%d %H:%M:%S')  # Get current date and time
@@ -117,4 +117,6 @@ jobs:
           git add .
           
           git commit -m "Update ${{ env.BRANCH_NAME }} API image tag"
+          # pull any changes
+          git pull origin ${{ env.BRANCH_NAME }}
           git push origin ${{ env.BRANCH_NAME }}  # Update the branch name as needed        
diff --git a/.github/workflows/build-push-edtcore.yml b/.github/workflows/build-push-edtcore.yml
@@ -17,10 +17,12 @@ env:
 jobs:
   build:
     runs-on: ubuntu-latest
+    concurrency: $${{ github.ref_name }}-helm
+
     if: github.event_name == 'push'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set environment for branch
         run: |
@@ -93,8 +95,6 @@ jobs:
 
           cd gitops/charts
 
-          # pull any changes
-          git pull origin ${{ env.BRANCH_NAME }}
             
           # Update the Helm values file with the new image tag and version
           DATETIME=$(date +'%Y-%m-%d %H:%M:%S')  # Get current date and time
@@ -120,6 +120,9 @@ jobs:
           git add .
 
           git commit -m "Update ${{ env.BRANCH_NAME }} API image tag"
+
+          # pull any changes
+          git pull origin ${{ env.BRANCH_NAME }}
           git push origin ${{ env.BRANCH_NAME }}  # Update the branch name as needed
 
 
diff --git a/.github/workflows/build-push-frontend.yml b/.github/workflows/build-push-frontend.yml
@@ -16,10 +16,12 @@ env:
 jobs:
   build:
     runs-on: ubuntu-latest
+    concurrency: $${{ github.ref_name }}-helm
+
     if: github.event_name == 'push'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set environment for branch
         run: |
@@ -89,9 +91,6 @@ jobs:
           
           # Navigate to the directory containing your Helm values file for the environment develop -> DEV, test -> test
           cd gitops/charts
-
-          # pull any changes
-          git pull origin ${{ env.BRANCH_NAME }}
           
           # Update the Helm values file with the new image tag and version
           DATETIME=$(date +'%Y-%m-%d %H:%M:%S')  # Get current date and time
@@ -117,5 +116,8 @@ jobs:
           git add .
           
           git commit -m "Update ${{ env.BRANCH_NAME }} API image tag"
+
+          # pull any changes
+          git pull origin ${{ env.BRANCH_NAME }}
           git push origin ${{ env.BRANCH_NAME }}  # Update the branch name as needed
           
diff --git a/.github/workflows/build-push-islinterfaces.yml b/.github/workflows/build-push-islinterfaces.yml
@@ -17,10 +17,12 @@ env:
 jobs:
   build:
     runs-on: ubuntu-latest
+    concurrency: $${{ github.ref_name }}-helm
+
     if: github.event_name == 'push'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set environment for branch
         run: |
@@ -91,9 +93,6 @@ jobs:
           
           # Navigate to the directory containing your Helm values file for the environment develop -> DEV, test -> test
           cd gitops/charts
-
-          # pull any changes
-          git pull origin ${{ env.BRANCH_NAME }}
           
           # Update the Helm values file with the new image tag and version
           DATETIME=$(date +'%Y-%m-%d %H:%M:%S')  # Get current date and time
@@ -119,6 +118,9 @@ jobs:
           git add .
           
           git commit -m "Update ${{ env.BRANCH_NAME }} API image tag"
+
+          # pull any changes
+          git pull origin ${{ env.BRANCH_NAME }}
           git push origin ${{ env.BRANCH_NAME }}  # Update the branch name as needed       
           
 
diff --git a/.github/workflows/build-push-jamservice.yml b/.github/workflows/build-push-jamservice.yml
@@ -17,10 +17,12 @@ env:
 jobs:
   build:
     runs-on: ubuntu-latest
+    concurrency: $${{ github.ref_name }}-helm
+
     if: github.event_name == 'push'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set environment for branch
         run: |
@@ -90,13 +92,6 @@ jobs:
           # Navigate to the directory containing your Helm values file for the environment develop -> DEV, test -> test
           cd gitops/charts
 
-          # pull any changes
-          git pull origin ${{ env.BRANCH_NAME }}
-          
-          # pull any changes
-          git pull origin ${{ env.BRANCH_NAME }}
-
-
           # Update the Helm values file with the new image tag and version
           DATETIME=$(date +'%Y-%m-%d %H:%M:%S')  # Get current date and time
           echo "Updating tag apitag: to ${{ steps.short_sha.outputs.SHORT_SHA }}"
@@ -121,4 +116,7 @@ jobs:
           git add .
           
           git commit -m "Update ${{ env.BRANCH_NAME }} API image tag"
+
+          # pull any changes
+          git pull origin ${{ env.BRANCH_NAME }}
           git push origin ${{ env.BRANCH_NAME }}  # Update the branch name as needed          
diff --git a/.github/workflows/build-push-jumapi.yml b/.github/workflows/build-push-jumapi.yml
@@ -17,10 +17,12 @@ env:
 jobs:
   build:
     runs-on: ubuntu-latest
+    concurrency: $${{ github.ref_name }}-helm
+
     if: github.event_name == 'push'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set environment for branch
         run: |
@@ -90,8 +92,6 @@ jobs:
           # Navigate to the directory containing your Helm values file for the environment develop -> DEV, test -> test
           cd gitops/charts
 
-          # pull any changes
-          git pull origin ${{ env.BRANCH_NAME }}
             
           # Update the Helm values file with the new image tag and version
           DATETIME=$(date +'%Y-%m-%d %H:%M:%S')  # Get current date and time
@@ -117,6 +117,9 @@ jobs:
           git add .
 
           git commit -m "Update ${{ env.BRANCH_NAME }} API image tag"
+
+          # pull any changes
+          git pull origin ${{ env.BRANCH_NAME }}
           git push origin ${{ env.BRANCH_NAME }}  # Update the branch name as needed        
 
 
diff --git a/.github/workflows/build-push-kafka-connectors.yml b/.github/workflows/build-push-kafka-connectors.yml
@@ -20,7 +20,7 @@ jobs:
     if: github.event_name == 'push'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set environment for branch
         run: |

diff --git a/.github/workflows/build-push-maintenance.yml b/.github/workflows/build-push-maintenance.yml
@@ -16,10 +16,12 @@ env:
 jobs:
   build:
     runs-on: ubuntu-latest
+    concurrency: $${{ github.ref_name }}-helm
+
     if: github.event_name == 'push'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set environment for branch
         run: |
@@ -88,9 +90,7 @@ jobs:
             
           # Navigate to the directory containing your Helm values file for the environment develop -> DEV, test -> test
           cd gitops/charts
-            
-          # pull any changes
-          git pull origin ${{ env.BRANCH_NAME }}
+
 
           # Update the Helm values file with the new image tag and version
           DATETIME=$(date +'%Y-%m-%d %H:%M:%S')  # Get current date and time
@@ -115,6 +115,9 @@ jobs:
           git add .
 
           git commit -m "Update ${{ env.BRANCH_NAME }} API image tag"
+
+          # pull any changes
+          git pull origin ${{ env.BRANCH_NAME }}
           git push origin ${{ env.BRANCH_NAME }}  # Update the branch name as needed