Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 2 additions & 28 deletions .github/pkg-workflows/debian/pkg-pr-hook.yml

@simonbeaudoin0935 simonbeaudoin0935 Jun 17, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reduced the name length for better visibility in the UI.
The resolve-suite job is not necessary to happen here anymore, its all done in the pkg-build-reusable-workflow

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: PR Pre and Post Merge Build
name: PR Build

on:
pull_request:
Expand All @@ -10,41 +10,15 @@ permissions:
packages: read

jobs:
resolve-suite:
name: Resolve suite from branch
if: github.repository_owner == 'qualcomm-linux' && github.repository != 'qualcomm-linux/pkg-template'
runs-on: ubuntu-latest
outputs:
suite: ${{ steps.resolve.outputs.suite }}
steps:
- name: Derive suite from target branch
id: resolve
env:
BASE_REF: ${{ github.base_ref }}
run: |
set -euo pipefail
case "$BASE_REF" in
qcom/ubuntu/*|qcom/debian/*)
suite="${BASE_REF##*/}"
;;
*)
suite=sid
;;
esac
echo "suite=$suite" >> "$GITHUB_OUTPUT"
echo "Resolved suite: $suite (from branch: $BASE_REF)"

build:
name: Build Debian Package
needs: resolve-suite
name: PR Build
if: ${{ github.event.action != 'closed' || github.event.pull_request.merged == true }}
uses: qualcomm-linux/qcom-build-utils/.github/workflows/pkg-build-reusable-workflow.yml@main
with:
qcom-build-utils-ref: main
# PRE-MERGE: use the PR head branch (github.head_ref)
# POST-MERGE: use the base branch name from the PR
debian-ref: ${{ (github.event.action == 'closed' && github.event.pull_request.merged) && github.event.pull_request.base.ref || github.head_ref }}
suite: ${{ needs.resolve-suite.outputs.suite }}
debusine-parent-workspace: ${{ vars.DEBUSINE_PARENT_WORKSPACE }}
secrets:
DEBUSINE_USER: ${{ secrets.DEBUSINE_USER }}
Expand Down

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Reduced the name length for better visibility in the UI.
  • Suite is no longer an input parameter, its infered from branch name

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build Debian Package
name: Build
description: |
Builds the debian package represented by this repo at the ref pointed by the debain-ref argument.

Expand All @@ -12,20 +12,6 @@ on:
required: true
default: qcom/debian/latest

suite:
description: The distribution codename or Debian suite to build for. Ex noble, questing, resolute, trixie, sid, unstable
type: choice
default: unstable
options:
- noble
- questing
- resolute
- unstable
- forky
- trixie
- bookworm
- sid

force-docker-build:
description: Force local pkg-builder instead of Debusine for Debian-family suites
type: boolean
Expand All @@ -37,11 +23,11 @@ permissions:

jobs:
build:
name: Build
uses: qualcomm-linux/qcom-build-utils/.github/workflows/pkg-build-reusable-workflow.yml@main
with:
qcom-build-utils-ref: main
debian-ref: ${{ inputs.debian-ref }}
suite: ${{ inputs.suite }}
force-docker-build: ${{ inputs.force-docker-build }}
debusine-parent-workspace: ${{ vars.DEBUSINE_PARENT_WORKSPACE }}
secrets:
Expand Down

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reduced the name length for better visibility in the UI.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Promote New Prebuilt Binary Version
name: Promote Prebuilt

on:
workflow_dispatch:
Expand Down

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Reduced the name length for better visibility in the UI.
  • Deleted default branch name since since its error prone, a user can easily forget to change the default which is almost never the right choice anyway.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Promote New Upstream Version
name: Promote

on:
workflow_dispatch:
Expand All @@ -7,8 +7,7 @@ on:
debian-branch:
description: The debian branch to apply the promotion to. For example branch "qcom/debian/latest"
type: string
required: false
default: qcom/debian/latest
required: true

upstream-tag:
description: The upstream tag to promote this package repo to. Eg, v1.1.0 or 1.2.0, depending on the versioning style
Expand All @@ -22,6 +21,7 @@ permissions:

jobs:
promote:
name: Promote

uses: qualcomm-linux/qcom-build-utils/.github/workflows/pkg-promote-reusable-workflow.yml@main
with:
Expand Down

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Reduced the name length for better visibility in the UI.
  • Suite is no longer an input parameter, its infered from branch name
  • Deleted default branch name since since its error prone, a user can easily forget to change the default which is almost never the right choice anyway.
  • Added QSC_API_KEY secret passing here since we do the qartifactory upload from the pkg-release-reusable-workflow itself as opposed to before where we had a hop from this repo to qcom-distro-images

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Release Version
name: Release
description: |
Release a new package version.
This workflow is manually triggered via workflow_dispatch.
Expand All @@ -7,30 +7,15 @@ on:
workflow_dispatch:
inputs:

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:
description: The debian branch to use to execute the release from. For example branch "qcom/debian/latest"
description: The debian branch to release. For example branch "qcom/debian/trixie"
type: string
required: false
default: qcom/debian/latest
required: true

test-run:
description: |
Debian suites: if true, stop after the Debusine build and installability test.
Ubuntu codenames: preserve the previous release flow, including upload to the test S3 location.
Debian: if true, stop after build/test.
Ubuntu: still runs the full release flow.
type: boolean
default: true

Expand All @@ -39,12 +24,10 @@ permissions:
packages: read

jobs:
release:

Release:
uses: qualcomm-linux/qcom-build-utils/.github/workflows/pkg-release-reusable-workflow.yml@main
with:
qcom-build-utils-ref: main
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 }}
Expand All @@ -53,3 +36,4 @@ jobs:
DEBUSINE_USER: ${{ secrets.DEBUSINE_USER }}
DEBUSINE_TOKEN: ${{ secrets.DEBUSINE_TOKEN }}
DEBUSINE_RELEASE_TOKEN: ${{ secrets.DEBUSINE_RELEASE_TOKEN }}
QSC_API_KEY: ${{ secrets.DEB_PKG_BOT_CI_QSC_TOKEN }}
Loading
Loading