feat(update-artifacts-file): add branch support

.github/workflows/test-artifactory-login.yaml

@@ -1,9 +1,7 @@
 name: Test artifactory-login action
 
 on:
-  push:
-    branches:
-      - master
+  pull_request:
     paths:
       - "actions/artifactory-login/**"
 

.github/workflows/test-build-and-push-docker.yaml

@@ -1,9 +1,7 @@
 name: Test Build and Push Docker Image
 
 on:
-  push:
-    branches:
-      - master
+  pull_request:
     paths:
       - "actions/build-docker/**"
       - "actions/push-docker/**"

.github/workflows/test-build-and-push-helm.yaml

@@ -1,9 +1,7 @@
 name: Test Build and Push Helm Chart
 
 on:
-  push:
-    branches:
-      - master
+  pull_request:
     paths:
       - "actions/build-and-push-helm/**"
 

.github/workflows/test-eslint.yml

@@ -2,9 +2,6 @@ name: Test ESLint repository
 
 on:
   pull_request:
-  push:
-    branches:
-      - master
     paths:
       - "actions/eslint/**"
 

.github/workflows/test-helm-lint.yml

@@ -1,9 +1,7 @@
 name: Helm Lint repository
 
 on:
-  push:
-    branches:
-      - master
+  pull_request:
     paths:
       - "actions/helm-lint/**"
 
@@ -20,6 +18,7 @@ jobs:
 
       - name: helm lint
         uses: ./actions/helm-lint
+        id: helm-lint
         with:
           repository: ${{ github.repository }}
           chartDirs: "./test/helm"

.github/workflows/test-init-npm.yaml

@@ -2,9 +2,6 @@ name: Init-npm repository
 
 on:
   pull_request:
-  push:
-    branches:
-      - master
     paths:
       - "actions/init-npm/**"
 

.github/workflows/test-openapi-lint.yaml

@@ -2,9 +2,6 @@ name: Test OpenApi-lint
 
 on:
   pull_request:
-  push:
-    branches:
-      - master
     paths:
       - "actions/opanapi-lint/**"
 

.github/workflows/test-update-artifacts-file.yml

@@ -1,9 +1,7 @@
 name: Update artifacts.json
 
 on:
-  push:
-    branches:
-      - master
+  pull_request:
     paths:
       - "actions/update-artifacts-file/**"
 
@@ -23,3 +21,4 @@ jobs:
           artifact_tag: "5.0.17"
           registry: ${{ secrets.ACR_URL }}
           github_token: ${{ secrets.GH_PAT }}
+          target_repo: "mapcolonies/helm-charts-test"

actions/update-artifacts-file/README.md

@@ -23,6 +23,7 @@ This GitHub Action builds and publishes a Helm chart to a specified registry and
 | `registry`       | Registry URL the artifact is pushed to (e.g., ACR address)                  | ✅ Yes   |                              |
 | `github_token`   | GitHub token with permission to clone, commit & push to the target repo     | ✅ Yes   |                              |
 | `target_repo`    | Target GitHub repo where `artifacts.json` should be updated (e.g. `org/repo`)| ❌ No    | `mapcolonies/helm-charts`   |
+| `target_branch`  | Target branch in the repository to update                                   | ❌ No    | `master`                     |
 
 ---
 

actions/update-artifacts-file/action.yaml

@@ -27,6 +27,10 @@ inputs:
     description: "Target GitHub repository"
     required: false
     default: "mapcolonies/helm-charts"
+  target_branch:
+    description: "Target branch in the repository to update"
+    required: false
+    default: "master"
 
 runs:
   using: "composite"
@@ -37,6 +41,7 @@ runs:
         repository: ${{ inputs.target_repo }}
         token: ${{ inputs.github_token }}
         path: $TARGET_PATH
+        ref: ${{ inputs.target_branch }}
 
     - name: Set execute permission on modify script
       run: chmod +x actions/update-artifacts-file/modify_artifacts.sh
@@ -68,6 +73,7 @@ runs:
         GITHUB_TOKEN: ${{ inputs.github_token }}
         TARGET_REPO: ${{ inputs.target_repo }}
         TARGET_DIR: $TARGET_PATH
+        TARGET_BRANCH: ${{ inputs.target_branch }}
 
     - name: Clean up target repo folder
       run: rm -rf $TARGET_PATH

actions/update-artifacts-file/commit_changes.sh

@@ -4,19 +4,21 @@ cd "$TARGET_DIR"
 git config user.name "mapcolonies[bot]"
 git config user.email "devops[bot]@mapcolonies.com"
 
+git checkout "$TARGET_BRANCH"
+
 git add "$DOMAIN/artifacts.json"
 git commit -m "chore: update artifacts.json for $DOMAIN" -m "with $TYPE artifact: $ARTIFACT_NAME:$ARTIFACT_TAG" || echo "Nothing to commit"
 
 success=false
 for ((i=1; i<=5; i++)); do
   echo "Attempt $i to push changes..."
-  if git push https://x-access-token:$GITHUB_TOKEN@github.com/$TARGET_REPO.git; then
+  if git push https://x-access-token:$GITHUB_TOKEN@github.com/$TARGET_REPO.git "$TARGET_BRANCH"; then
     success=true
     echo "Push succeeded"
     break
   else
     echo "Push failed, retrying after pull"
-    git pull origin master --ff-only || true
+    git pull origin "$TARGET_BRANCH" --ff-only || true
     sleep 5
   fi
 done