Skip to content

Commit 986f379

Browse files
Move the reusable workflow into a directory named reusable-workflows
Signed-off-by: Simon Beaudoin <[email protected]>
1 parent 66ca2c7 commit 986f379

File tree

4 files changed

+40
-9
lines changed

4 files changed

+40
-9
lines changed

README.md

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,18 @@ Overview
55
--------
66
qcom-build-utils holds set of tools which to developers to build, test and debug platform and CI/CD utilities.
77

8-
Branches
9-
--------
10-
main: Primary development branch. Contributors should develop submissions based on this branch, and submit pull requests to this branch.
11-
128
Features
139
--------
14-
- ubuntu/build-utils scripts helps to assist build debian package, create system image and other tools related to ubuntu.
10+
- scripts/ : Helper scripts to used in the reusable workflows
11+
- reusable-workflows/ : Reusable workflows that other repo shall call
1512

16-
for more information, please refer to the README in each subdirectory.
13+
Branches
14+
--------
15+
main: Primary stable branch. Contributors should develop submissions based on this branch, and submit pull requests to this branch.
16+
development : Development happens on this branch, and gets merged back to main when the features are deemed stable
17+
internal : This branch is the mirror of the internal version of the build-utils repo. It is there to keep a mirror, but the content
18+
main and delvelopment has diverged substentially from it. It exists to that internal CI can use it, but should not be used
19+
as a base for development
1720

1821
License
1922
-------

.github/workflows/qcom-build-debian-package-reusable-workflow.yml renamed to reusable-workflows/build-debian-package-reusable-workflow.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# This is the reusable workflow that gets invoked in other package repositories
2+
13
name: Qualcomm Build Debian Package Reusable Workflow
24
on:
35
workflow_call:
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# This is the TEMPLATE workflow that needs to be copied in the .github/workflows folder
2+
# of any new debian package repo.
3+
4+
# If need be, adjust the branch/tag in the line that invokes the reusable workflow
5+
# Also change the ref: to also match it
6+
7+
name: Build Debian Package
8+
9+
on:
10+
pull_request_target:
11+
branches: [ main ]
12+
push:
13+
branches: [ main ]
14+
workflow_dispatch:
15+
16+
permissions:
17+
contents: read
18+
security-events: write
19+
20+
jobs:
21+
build:
22+
uses: qualcomm-linux/qcom-build-utils/reusable-workflows/build-debian-package-reusable-workflow.yml@main
23+
with:
24+
ref: main
25+
secrets:
26+
ACTIONS_SSH_KEY: ${{ secrets.ACTIONS_SSH_KEY }}

scripts/ppa_organizer.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
4545
This script will extract the 'canonical' package name (ie, without the major number in it, in this case its 1)
4646
and create a folder in the PPA structure for this package name, and copy over all the .deb/ddeb that correspondt to it.
47-
47+
4848
This operation will be done for all the 'canonical' package names because again, there can be multiple of this example package
4949
alongside one another
5050
@@ -81,7 +81,7 @@ def reorganize(build_dir : str, output_dir : str):
8181

8282
# Create a list of all the packages (.deb, -dev.deb, -dbgsym.ddeb)
8383
files = os.listdir(build_dir)
84-
84+
8585
dsc_files = [f for f in files if f.endswith('.dsc') ]
8686
deb_files = [f for f in files if f.endswith('.deb') and "-dev" not in f]
8787
dev_files = [f for f in files if f.endswith('.deb') and "-dev" in f]
@@ -113,7 +113,7 @@ def reorganize(build_dir : str, output_dir : str):
113113
for package_name in package_names:
114114

115115
output_dir = os.path.join(output_dir, package_name)
116-
116+
117117
# Do not delete if the directory exists, it may very well contain the same package, but with older versions
118118
# We want to copy the newly built packages alongside the other versions
119119
create_new_directory(output_dir, delete_if_exists=False)

0 commit comments

Comments
 (0)