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
12 changes: 9 additions & 3 deletions .github/actions/build_package/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,18 @@ description: |
This Github Actions builds the package

inputs:
distro-codename:
description: The distribution codename to build for. Ex noble, questing, etc
required: true

pkg-dir:
description: The directory where the debian package source is
required: true

build-dir:
description: The directory where the package is built
required: true

run-lintian:
description: Run lintian or not during the build
default: false
Expand Down Expand Up @@ -60,8 +66,8 @@ runs:
lintian_flag="--no-run-lintian"
fi

if curl -sfI "http://pkg.qualcomm.com/dists/${{env.UBUNTU_DISTRIBUTION}}/Release" > /dev/null; then
EXTRA_REPO="--extra-repository='deb [arch=arm64 trusted=yes] http://pkg.qualcomm.com ${{env.UBUNTU_DISTRIBUTION}}/stable main'"
if curl -sfI "http://pkg.qualcomm.com/dists/${{inputs.distro-codename}}/Release" > /dev/null; then
EXTRA_REPO="--extra-repository='deb [arch=arm64 trusted=yes] http://pkg.qualcomm.com ${{inputs.distro-codename}}/stable main'"
else
EXTRA_REPO=""
fi
Expand All @@ -76,7 +82,7 @@ runs:
--git-ignore-branch \
--git-builder="sbuild --host=arm64 \
--build=${{env.BUILD_ARCH}} \
--dist=${{env.UBUNTU_DISTRUBUTION}} \
--dist=${{inputs.distro-codename}} \
$lintian_flag \
--build-dir ../${{inputs.build-dir}} \
--build-dep-resolver=apt \
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/qcom-build-pkg-reusable-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ on:
required: true
default: debian/latest

ubuntu-distribution:
description: The ubuntu distribution to build for. Ex noble, jammy, etc
distro-codename:
description: The distribution codename to build for. Ex noble, jammy, etc
type: string
default: noble

Expand Down Expand Up @@ -60,8 +60,6 @@ env:
REPO_URL: https://qualcomm-linux.github.io/pkg-oss-staging-repo/
REPO_NAME: qualcomm-linux/pkg-oss-staging-repo

UBUNTU_DISTRIBUTION: ${{inputs.ubuntu-distribution}}

jobs:
build-debian-package:

Expand Down Expand Up @@ -104,6 +102,7 @@ jobs:
- name: Build Debian Packages
uses: ./qcom-build-utils/.github/actions/build_package
with:
distro-codename: ${{inputs.distro-codename}}
pkg-dir: package-repo
build-dir: build-area
run-lintian: ${{inputs.run-lintian}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ on:
type: boolean
default: false

distro-codename:
description: The distribution codename to build for. Ex noble, jammy, etc
type: string
default: noble

runner:
description: The runner to use for the build
type: string
Expand All @@ -51,8 +56,6 @@ env:
# For ABI checker
REPO_URL: https://qualcomm-linux.github.io/pkg-oss-staging-repo/

UBUNTU_DISTRIBUTION: noble #TODO change this to a param

upstream_version: ""
distro_revision: ""

Expand Down Expand Up @@ -184,7 +187,7 @@ jobs:
# use -b to ignore new version is less than current version. This happens because of the ~pr#
gbp dch \
--ignore-branch \
--distribution=${{env.UBUNTU_DISTRIBUTION}} \
--distribution=${{inputs.distro-codename}} \
--new-version=${{env.upstream_version}}~pr${{inputs.pr-number}}-${{env.distro_revision}} \
--dch-opt="-b"

Expand All @@ -193,6 +196,7 @@ jobs:
- name: Build Debian Packages
uses: ./qcom-build-utils/.github/actions/build_package
with:
distro-codename: ${{inputs.distro-codename}}
pkg-dir: package-repo
build-dir: build-area
run-lintian: ${{inputs.run-lintian}}
Expand Down
Loading
Loading