Add prefix to automated branch names

This change avoids conflicts with similarly named branches. This avoids cases where, without a prefix, two branches would be identically named e.g. master and stackhpc/master
stackhpc · Jan 24, 2025 · ccbdd87 · ccbdd87
1 parent 54b3d5b
commit ccbdd87
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/ansible/roles/source-repo-sync/tasks/add_community_files.yml b/ansible/roles/source-repo-sync/tasks/add_community_files.yml
@@ -17,7 +17,7 @@
         cmd: |
           gh api \
           -H "Accept: application/vnd.github.v3+json" \
-          /repos/{{ owner }}/{{ repository_manifest.name }}/git/ref/heads/{{ community_manifest.branch }}-community-files
+          /repos/{{ owner }}/{{ repository_manifest.name }}/git/ref/heads/{{ community_manifest.prefix | default("") }}{{ community_manifest.branch }}-community-files
       changed_when: false
       failed_when: false
       register: branch_exists
@@ -28,13 +28,13 @@
           gh api \
           --method DELETE \
           -H "Accept: application/vnd.github.v3+json" \
-          /repos/{{ owner }}/{{ repository_manifest.name }}/git/refs/heads/{{ community_manifest.branch }}-community-files
+          /repos/{{ owner }}/{{ repository_manifest.name }}/git/refs/heads/{{ community_manifest.prefix | default("") }}{{ community_manifest.branch }}-community-files
       when: branch_exists.rc == 0
 
     - name: Create working branch # noqa command-instead-of-module
       ansible.builtin.shell:
         cmd: >
-          git checkout -b {{ community_manifest.branch }}-community-files \
+          git checkout -b {{ community_manifest.prefix | default("") }}{{ community_manifest.branch }}-community-files \
             origin/{{ community_manifest.prefix | default("") }}{{ community_manifest.branch }}
         chdir: "{{ staging_path }}/{{ repository_manifest.name }}"
       changed_when: true
@@ -65,7 +65,7 @@
 
     - name: Push branch to remote # noqa command-instead-of-module command-instead-of-shell no-handler
       ansible.builtin.shell:
-        cmd: "git push -u origin {{ community_manifest.branch }}-community-files"
+        cmd: "git push -u origin {{ community_manifest.prefix | default('') }}{{ community_manifest.branch }}-community-files"
         chdir: "{{ staging_path }}/{{ repository_manifest.name }}"
       when: community_copy.changed | bool
 

diff --git a/ansible/roles/source-repo-sync/tasks/add_workflows.yml b/ansible/roles/source-repo-sync/tasks/add_workflows.yml
@@ -17,7 +17,7 @@
         cmd: |
           gh api \
           -H "Accept: application/vnd.github.v3+json" \
-          /repos/{{ owner }}/{{ repository_manifest.name }}/git/ref/heads/{{ workflow_manifest.branch }}-workflows
+          /repos/{{ owner }}/{{ repository_manifest.name }}/git/ref/heads/{{ workflow_manifest.prefix | default("") }}{{ workflow_manifest.branch }}-workflows
       changed_when: false
       failed_when: false
       register: working_branch_exists
@@ -28,13 +28,13 @@
           gh api \
           --method DELETE \
           -H "Accept: application/vnd.github.v3+json" \
-          /repos/{{ owner }}/{{ repository_manifest.name }}/git/refs/heads/{{ workflow_manifest.branch }}-workflows
+          /repos/{{ owner }}/{{ repository_manifest.name }}/git/refs/heads/{{ workflow_manifest.prefix | default("") }}{{ workflow_manifest.branch }}-workflows
       when: working_branch_exists.rc == 0
 
     - name: Create working branch # noqa command-instead-of-module
       ansible.builtin.shell:
         cmd: >
-          git checkout -b {{ workflow_manifest.branch }}-workflows \
+          git checkout -b {{ workflow_manifest.prefix | default("") }}{{ workflow_manifest.branch }}-workflows \
             origin/{{ workflow_manifest.prefix | default("") }}{{ workflow_manifest.branch }}
         chdir: "{{ staging_path }}/{{ repository_manifest.name }}"
       changed_when: true
@@ -84,7 +84,7 @@
 
         - name: Push branch to remote # noqa command-instead-of-module command-instead-of-shell no-handler
           ansible.builtin.shell:
-            cmd: "git push -u origin {{ workflow_manifest.branch }}-workflows"
+            cmd: "git push -u origin {{ workflow_manifest.prefix | default('') }}{{ workflow_manifest.branch }}-workflows"
             chdir: "{{ staging_path }}/{{ repository_manifest.name }}"
           changed_when: true