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
2 changes: 1 addition & 1 deletion .github/pkg-workflows/debian/pr-pre-post-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ jobs:
# 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 }}
debusine-parent-workspace: ${{ vars.DEBUSINE_PARENT_WORKSPACE || 'ci' }}
debusine-parent-workspace: ${{ vars.DEBUSINE_PARENT_WORKSPACE }}
2 changes: 1 addition & 1 deletion .github/pkg-workflows/main/build-debian-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ jobs:
qcom-build-utils-ref: main
debian-ref: ${{ inputs.debian-ref }}
suite: ${{ inputs.suite }}
debusine-parent-workspace: ${{ vars.DEBUSINE_PARENT_WORKSPACE || 'ci' }}
debusine-parent-workspace: ${{ vars.DEBUSINE_PARENT_WORKSPACE }}
2 changes: 1 addition & 1 deletion .github/pkg-workflows/main/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
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' }}
debusine-parent-workspace: ${{ vars.DEBUSINE_PARENT_WORKSPACE }}
secrets:
PAT: ${{ secrets.DEB_PKG_BOT_CI_TOKEN }}
DEBUSINE_USER: ${{ secrets.DEBUSINE_USER }}
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/qcom-build-pkg-reusable-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ on:
debusine-parent-workspace:
description: Parent Debusine workspace used to create per-run child CI workspaces for Debian builds
type: string
default: ci

secrets:
DEBUSINE_USER:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/qcom-release-reusable-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ on:
debusine-parent-workspace:
description: Parent Debusine workspace used to create per-run child CI workspaces for Debian builds
type: string
default: ci

secrets:
PAT:
Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/workflows_sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,14 @@ jobs:
# Track if changes are needed
isDirty=false

# Remove legacy per-repo workflows_sync workflow if present.
# The source of truth is qcom-build-utils/.github/workflows/workflows_sync.yml.
if [[ -f ".github/workflows/workflows_sync.yml" ]]; then
echo " 🗑️ Removing deprecated workflows_sync.yml"
rm ".github/workflows/workflows_sync.yml"
isDirty=true
fi

# Compare and sync workflow files
for workflow in ../qcom-build-utils/.github/pkg-workflows/main/*.yml; do
workflow_name=$(basename "$workflow")
Expand All @@ -136,7 +144,7 @@ jobs:
if [[ "$isDirty" == "true" ]]; then
echo " 📝 Creating branch and committing main branch changes"
git checkout -b sync/qcom-build-utils-workflows 2>&1 | sed 's/^/ /'
git add .github/workflows/
git add -A .github/workflows/
git commit -s -m "chore: sync workflows from qcom-build-utils" 2>&1 | sed 's/^/ /'

if [[ "$CONFIRMATION_INPUT" == "true" ]]; then
Expand Down
4 changes: 2 additions & 2 deletions docs/reusable-workflows.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ jobs:
qcom-build-utils-ref: development
debian-ref: debian/qcom-next
suite: trixie
debusine-parent-workspace: ${{ vars.DEBUSINE_PARENT_WORKSPACE || 'ci' }}
debusine-parent-workspace: ${{ vars.DEBUSINE_PARENT_WORKSPACE }}
```

#### Matrix-safe caller
Expand Down Expand Up @@ -180,7 +180,7 @@ jobs:
suite: trixie
debian-branch: debian/qcom-next
test-run: false
debusine-parent-workspace: ${{ vars.DEBUSINE_PARENT_WORKSPACE || 'ci' }}
debusine-parent-workspace: ${{ vars.DEBUSINE_PARENT_WORKSPACE }}
secrets:
PAT: ${{ secrets.DEB_PKG_BOT_CI_TOKEN }}
DEBUSINE_USER: ${{ secrets.DEBUSINE_USER }}
Expand Down
Loading