Dev/sbeaudoi

.github/workflows/build-debian-package.yml

@@ -12,15 +12,18 @@ on:
         required: true
         default: debian/qcom-next
 
-      distro-codename:
-        description: The distribution codename to build for. Ex noble, questing, etc
+      suite:
+        description: The distribution codename or Debian suite to build for. Ex noble, questing, resolute, trixie, sid, unstable
         type: choice
         default: noble
         options:
           - noble
           - questing
           - resolute
+          - unstable
+          - forky
           - trixie
+          - bookworm
           - sid
 
       abi-checker:
@@ -34,9 +37,13 @@ permissions:
 
 jobs:
   build:
-    uses: qualcomm-linux/qcom-build-utils/.github/workflows/qcom-build-pkg-reusable-workflow.yml@main
+    uses: qualcomm-linux/qcom-build-utils/.github/workflows/qcom-build-pkg-reusable-workflow.yml@development
     with:
-      qcom-build-utils-ref: main
+      qcom-build-utils-ref: development
       debian-ref: ${{ inputs.debian-ref }}
-      distro-codename: ${{ inputs.distro-codename }}
-      run-abi-checker: ${{ inputs.abi-checker }}
+      suite: ${{ inputs.suite }}
+      debusine-parent-workspace: ${{ vars.DEBUSINE_PARENT_WORKSPACE || 'ci' }}
+      run-abi-checker: ${{ inputs.abi-checker }}
+    secrets:
+      DEBUSINE_USER: ${{ secrets.DEBUSINE_USER }}
+      DEBUSINE_TOKEN: ${{ secrets.DEBUSINE_TOKEN }}

.github/workflows/debusine-daily.yml

@@ -48,15 +48,18 @@ jobs:
       fail-fast: false
       matrix:
         target_branch: ${{ fromJson(needs.check-branches.outputs.matrix) }}
-    uses: qualcomm-linux/debusine-action/.github/workflows/debusine.yml@main
+    uses: qualcomm-linux/debusine-action/.github/workflows/debusine.yml@dev/sbeaudoi
     with:
       target_branch: ${{ matrix.target_branch }}
       source_ref: refs/heads/${{ matrix.target_branch }}
       release: false
+      debusine-parent-workspace: ${{ vars.DEBUSINE_PARENT_WORKSPACE || 'ci' }}
       job_index: ${{ strategy.job-index }}
     permissions:
       contents: write
       deployments: write
+      id-token: write
+      packages: read
     secrets:
       DEBUSINE_USER: ${{ secrets.DEBUSINE_USER }}
       DEBUSINE_TOKEN: ${{ secrets.DEBUSINE_TOKEN }}

.github/workflows/debusine-pr-check.yml

@@ -15,16 +15,19 @@ permissions:
   contents: write
   deployments: write
   statuses: write
+  id-token: write
+  packages: read
 
 jobs:
   debusine:
     name: Debusine
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
-    uses: qualcomm-linux/debusine-action/.github/workflows/debusine.yml@main
+    uses: qualcomm-linux/debusine-action/.github/workflows/debusine.yml@dev/sbeaudoi
     with:
       source_ref: refs/pull/${{ github.event.workflow_run.pull_requests[0].number }}/merge
       target_branch: ${{ github.event.workflow_run.pull_requests[0].base.ref }}
       release: false
+      debusine-parent-workspace: ${{ vars.DEBUSINE_PARENT_WORKSPACE || 'ci' }}
     secrets:
       DEBUSINE_USER: ${{ secrets.DEBUSINE_USER }}
       DEBUSINE_TOKEN: ${{ secrets.DEBUSINE_TOKEN }}

.github/workflows/debusine-release.yml

@@ -3,14 +3,16 @@
 
 # SEE README.debusine.md BEFORE CHANGING THIS FILE
 
-# Note: in addition to the default branch, this workflow file must also be
-# copied into each packaging branch in order to function as intended.
-
 name: Debusine Release
 
 on:
   workflow_dispatch:
     inputs:
+      target-branch:
+        description: Packaging branch to build and optionally release
+        type: string
+        required: true
+        default: qcom/debian/trixie
       release:
         description: Run release step
         type: boolean
@@ -20,14 +22,17 @@ on:
 jobs:
   debusine:
     name: Debusine
-    if: startsWith(github.ref_name, 'qcom/debian/')
-    uses: qualcomm-linux/debusine-action/.github/workflows/debusine.yml@main
+    uses: qualcomm-linux/debusine-action/.github/workflows/debusine.yml@dev/sbeaudoi
     with:
-      target_branch: ${{ github.ref_name }}
+      target_branch: ${{ inputs.target-branch }}
+      source_ref: refs/heads/${{ inputs.target-branch }}
       release: ${{ inputs.release }}
+      debusine-parent-workspace: ${{ vars.DEBUSINE_PARENT_WORKSPACE || 'ci' }}
     permissions:
       contents: write
       deployments: write
+      id-token: write
+      packages: read
     secrets:
       DEBUSINE_USER: ${{ secrets.DEBUSINE_USER }}
       DEBUSINE_TOKEN: ${{ secrets.DEBUSINE_TOKEN }}

.github/workflows/pr-pre-post-merge.yml

@@ -13,17 +13,22 @@ on:
 
 permissions:
   contents: read
+  packages: read
 
 jobs:
   build:
     # This condition ensures that the job runs for all PR actions except closed unmerged,
     # i.e., it runs for opened, synchronize, reopened (pre-merge) and closed merged (post-merge).
     if: ${{ github.event.action != 'closed' || github.event.pull_request.merged == true }}
-    uses: qualcomm-linux/qcom-build-utils/.github/workflows/qcom-build-pkg-reusable-workflow.yml@main
+    uses: qualcomm-linux/qcom-build-utils/.github/workflows/qcom-build-pkg-reusable-workflow.yml@development
     with:
-      qcom-build-utils-ref: main  
+      qcom-build-utils-ref: development
       # PRE-MERGE: use the PR head branch (github.head_ref)
       # POST-MERGE: use the base branch name from the PR (e.g. "debian/qcom-next")
       debian-ref: ${{ (github.event.action == 'closed' && github.event.pull_request.merged) && github.event.pull_request.base.ref || github.head_ref }}
+      suite: sid
+      debusine-parent-workspace: ${{ vars.DEBUSINE_PARENT_WORKSPACE || 'ci' }}
       run-abi-checker: true
-    secrets: inherit
+    secrets:
+      DEBUSINE_USER: ${{ secrets.DEBUSINE_USER }}
+      DEBUSINE_TOKEN: ${{ secrets.DEBUSINE_TOKEN }}

.github/workflows/promote-prebuilt.yml

@@ -37,12 +37,12 @@ on:
 permissions:
   contents: write
   pull-requests: write
+  id-token: write
 
 jobs:
   promote:
-    uses: qualcomm-linux/qcom-build-utils/.github/workflows/qcom-promote-prebuilt-reusable-workflow.yml@dev/pkg-bin
+    uses: qualcomm-linux/qcom-build-utils/.github/workflows/qcom-promote-prebuilt-reusable-workflow.yml@development
     with:
-      qcom-build-utils-ref: dev/pkg-bin
       debian-branch: ${{inputs.debian-branch}}
       new-tag: ${{inputs.new-tag}}
       new-package-name: ${{inputs.new-package-name}}

.github/workflows/promote-upstream.yml

@@ -19,15 +19,15 @@ permissions:
   contents: write
   packages: read
   pull-requests: write
+  id-token: write
 
 jobs:
   promote:
 
-    uses: qualcomm-linux/qcom-build-utils/.github/workflows/qcom-promote-upstream-reusable-workflow.yml@main
+    uses: qualcomm-linux/qcom-build-utils/.github/workflows/qcom-promote-upstream-reusable-workflow.yml@development
     with:
-      qcom-build-utils-ref: main
       debian-branch: ${{inputs.debian-branch}}
       upstream-tag: ${{inputs.upstream-tag}}
       upstream-repo: ${{vars.UPSTREAM_REPO_GITHUB_NAME}}
     secrets:
-      PAT: ${{secrets.DEB_PKG_BOT_CI_TOKEN}} # If the source repo is private, this secret is necessary to be provided in the repo
+      PAT: ${{ secrets.DEB_PKG_BOT_CI_TOKEN }} # If the source repo is private, this secret is necessary to be provided in the repo

.github/workflows/release.yml

@@ -7,15 +7,18 @@ on:
   workflow_dispatch:
     inputs:
 
-      distro-codename:
-        description: The distribution codename to build for. Ex noble, questing, etc
+      suite:
+        description: The distribution codename or Debian suite to release for. Ex noble, questing, resolute, trixie, bookworm, sid, unstable
         type: choice
         default: noble
         options:
           - noble
           - questing
           - resolute
+          - unstable
+          - forky
           - trixie
+          - bookworm
           - sid
 
       debian-branch:
@@ -34,15 +37,18 @@ on:
 permissions:
   contents: write
   packages: read
+  id-token: write
 
 jobs:
   release:
 
-    uses: qualcomm-linux/qcom-build-utils/.github/workflows/qcom-release-reusable-workflow.yml@main
+    uses: qualcomm-linux/qcom-build-utils/.github/workflows/qcom-release-reusable-workflow.yml@development
     with:
-      qcom-build-utils-ref: main
-      distro-codename: ${{ github.event.inputs.distro-codename }}
+      suite: ${{ github.event.inputs.suite }}
       debian-branch: ${{ github.event.inputs.debian-branch }}
-      test-run: ${{ github.event.inputs.test-run == 'true' && true || false }}
+      debusine-parent-workspace: ${{ vars.DEBUSINE_PARENT_WORKSPACE || 'ci' }}
     secrets:
-      PAT: ${{secrets.DEB_PKG_BOT_CI_TOKEN}}
+      PAT: ${{ secrets.DEB_PKG_BOT_CI_TOKEN }}
+      DEBUSINE_USER: ${{ secrets.DEBUSINE_USER }}
+      DEBUSINE_TOKEN: ${{ secrets.DEBUSINE_TOKEN }}
+      DEBUSINE_RELEASE_TOKEN: ${{ secrets.DEBUSINE_RELEASE_TOKEN }}