Development

.github/workflows/qcom-build-pkg-reusable-workflow.yml

@@ -13,10 +13,10 @@ on:
         required: true
 
       debian-ref:
-        description: The debian ref to build. For example branch "debian/latest" or tag "debian/1.0.0-1"
+        description: The debian ref to build. For example branch "debian/qcom-next" or tag "debian/1.0.0-1"
         type: string
         required: true
-        default: debian/latest
+        default: debian/qcom-next
 
       distro-codename:
         description: The distribution codename to build for. Ex noble, jammy, etc
@@ -34,7 +34,7 @@ on:
         default: false
 
       is-post-merge:
-        description: true if this build has been triggered by a merge into debian/latest. Will ensure PR branch is deleted
+        description: true if this build has been triggered by a merge into debian/qcom-next. Will ensure PR branch is deleted
         type: boolean
         default: false
 
@@ -65,6 +65,7 @@ jobs:
         shell: bash
 
     container:
+      # This docker image is built and published by the qualcomm-linux/docker_deb_build repo CI workflow
       image: ghcr.io/qualcomm-linux/pkg-builder:${{inputs.runner == 'ubuntu-latest' && 'amd64' || 'arm64'}}-${{inputs.distro-codename}}
       options: --privileged
       credentials:

.github/workflows/qcom-promote-upstream-reusable-workflow.yml

@@ -54,6 +54,7 @@ jobs:
         shell: bash
 
     container:
+      # This docker image is built and published by the qualcomm-linux/docker_deb_build repo CI workflow
       image: ghcr.io/qualcomm-linux/pkg-builder:amd64-noble
       credentials:
         username: ${{ vars.DEB_PKG_BOT_CI_USERNAME }}

.github/workflows/qcom-release-reusable-workflow.yml

@@ -55,6 +55,7 @@ jobs:
         shell: bash
 
     container:
+      # This docker image is built and published by the qualcomm-linux/docker_deb_build repo CI workflow
       image: ghcr.io/qualcomm-linux/pkg-builder:${{inputs.runner == 'ubuntu-latest' && 'amd64' || 'arm64'}}-${{inputs.distro-codename}}
       options: --privileged
       credentials:

.github/workflows/qcom-upstream-pr-pkg-build-reusable-workflow.yml

@@ -68,6 +68,7 @@ jobs:
         shell: bash
 
     container:
+      # This docker image is built and published by the qualcomm-linux/docker_deb_build repo CI workflow
       image: ghcr.io/qualcomm-linux/pkg-builder:${{inputs.runner == 'ubuntu-latest' && 'amd64' || 'arm64'}}-${{inputs.distro-codename}}
       options: --privileged
       credentials:
@@ -125,15 +126,15 @@ jobs:
           git remote add upstream-source ../upstream-repo
           git fetch upstream-source "+refs/tags/*:refs/tags/*"
 
-      - name: Merge Upstream PR Changes to Packaging Repo on top of debian/latest
+      - name: Merge Upstream PR Changes to Packaging Repo on top of debian/qcom-next
         run: |
           cd ./package-repo
 
           git config user.name "${{vars.DEB_PKG_BOT_CI_NAME}}"
           git config user.email "${{vars.DEB_PKG_BOT_CI_EMAIL}}"
 
           git checkout upstream/latest
-          git checkout debian/latest
+          git checkout debian/qcom-next
           git checkout -b debian/upstream-pr
 
           version=$(dpkg-parsechangelog --show-field Version)
@@ -148,9 +149,9 @@ jobs:
           echo "upstream_version=$upstream_version" >> $GITHUB_ENV
           echo "distro_revision=$distro_revision" >> $GITHUB_ENV
 
-          # Run gbp with --no-merge, this is because we do not want gbp to perform the final merging of upstream/latest into debian/latest
+          # Run gbp with --no-merge, this is because we do not want gbp to perform the final merging of upstream/latest into debian/qcom-next
           # This because in upstream/latest, the top commit is the one of the filtering of git, github and debian folder. gbp will complain
-          # the merge is unseccessful because we want to merge with debian/latest, which has a workflow in .github, resulting in a merge conflict
+          # the merge is unseccessful because we want to merge with debian/qcom-next, which has a workflow in .github, resulting in a merge conflict
           # where in one branch we deleted .github folder, and the other we add files. We will therefore take the matter in our own hands manually after.
 
           gbp import-orig \
@@ -171,8 +172,8 @@ jobs:
           git merge \
             --allow-unrelated-histories \
             --signoff \
-            -m "Merge upstream/pr into debian/latest" \
-            -m "Filtered out .git, .github and debian from upstram, and preserved .github debian/latest" \
+            -m "Merge upstream/pr into debian/qcom-next" \
+            -m "Filtered out .git, .github and debian from upstram, and preserved .github debian/qcom-next" \
             upstream/latest
 
       - name: Promote Changelog