Skip to content

Commit f81f977

Browse files
Drop job-index and pin retention
Remove unused job-index plumbing from build reusable workflow. Set retention-days on upload-artifact steps and sync docs. Signed-off-by: Simon Beaudoin <sbeaudoi@qti.qualcomm.com>
1 parent 6d11606 commit f81f977

3 files changed

Lines changed: 4 additions & 8 deletions

File tree

.github/workflows/pkg-build-reusable-workflow.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,6 @@ on:
3737
type: string
3838
default: ""
3939

40-
job-index:
41-
description: Uniquely identifying index for matrix-expanded callers so Debusine child workspaces stay distinct
42-
type: string
43-
default: "0"
44-
4540
release:
4641
description: Prepare a release bundle (finalizes changelog, creates git bundle for push-release) for the Debian Debusine path
4742
type: boolean
@@ -259,6 +254,7 @@ jobs:
259254
name: docker-build-area
260255
path: docker-build-area.tgz
261256
if-no-files-found: error
257+
retention-days: 1
262258

263259
debian-build:
264260
name: Build (Debusine)
@@ -323,7 +319,6 @@ jobs:
323319
GITHUB_REPOSITORY_ID: ${{ github.repository_id }}
324320
GITHUB_RUN_ID: ${{ github.run_id }}
325321
GITHUB_RUN_ATTEMPT: ${{ github.run_attempt }}
326-
JOB_INDEX: ${{ inputs.job-index }}
327322
DEBUSINE_HOST: ${{ vars.DEBUSINE_HOST }}
328323
DEBUSINE_SCOPE: ${{ vars.DEBUSINE_SCOPE }}
329324
DEBUSINE_TOKEN: ${{ secrets.DEBUSINE_TOKEN }}
@@ -347,6 +342,7 @@ jobs:
347342
name: release-bundle
348343
path: release.bundle
349344
if-no-files-found: error
345+
retention-days: 1
350346

351347
test:
352348
name: Test

.github/workflows/pkg-release-reusable-workflow.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@ jobs:
204204
name: prepared-release-source
205205
path: prepared-release-source.tar.gz
206206
if-no-files-found: error
207+
retention-days: 1
207208

208209
- name: Select source preparation outputs
209210
id: select
@@ -607,6 +608,7 @@ jobs:
607608
name: release-provenance
608609
path: build/provenance.json
609610
if-no-files-found: error
611+
retention-days: 1
610612

611613
- name: Persist metadata to qcom-distro-artifacts
612614
env:

docs/reusable-workflows.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ flowchart TD
4646
| `run-lintian` | boolean | No | `true` | Used by the Ubuntu/pkg-builder path |
4747
| `run-abi-checker` | boolean | No | `false` | Used by the Ubuntu/pkg-builder path |
4848
| `is-prebuilt` | string | No | `""` | Passed through to the Ubuntu/pkg-builder `build_package` action |
49-
| `job-index` | string | No | `"0"` | Optional matrix index used to keep Debusine child workspace names unique |
5049
| `release` | boolean | No | `false` | Whether to prepare the release bundle before generating the Debian release source package |
5150
| `debusine-parent-workspace` | string | No | `ci` | Parent Debusine workspace used to create child CI workspaces for Debian builds |
5251

@@ -117,7 +116,6 @@ jobs:
117116
with:
118117
qcom-build-utils-ref: development
119118
debian-ref: refs/heads/${{ matrix.target_branch }}
120-
job-index: ${{ strategy.job-index }}
121119
```
122120
123121
This workflow is the low-level build/test primitive used directly by package

0 commit comments

Comments
 (0)