Skip to content

Commit 32c7fb0

Browse files
committed
ci: add pre-pull workflow to merge meta-qcom commit id
Use pre-pull.yml workflow to get the build passed commits id from meta-qcom. Merge the commits id to qcom-robotics-distro.yml for kas build. Signed-off-by: Teng Fan <tengf@qti.qualcomm.com>
1 parent 61d0a12 commit 32c7fb0

File tree

12 files changed

+1438
-51
lines changed

12 files changed

+1438
-51
lines changed

.github/actions/compile/action.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,12 @@ runs:
6767
echo "SSTATE_DIR PATH: "
6868
ls -al /efs/qli/meta-qcom-robotics-sdk
6969
70+
- name: Download merged configuration to compile
71+
uses: actions/download-artifact@v4
72+
with:
73+
name: qcom-robotics-distro-merged-${{ github.run_number }}
74+
path: ci/
75+
7076
- name: Dump kas-build yaml
7177
shell: bash
7278
run: |

.github/workflows/build-yocto.yml

Lines changed: 60 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,16 @@ on:
88
required: false
99
default: "true"
1010
type: string
11+
workflow_run_id:
12+
description: "Specific workflow run ID to check (optional, defaults to latest)"
13+
required: false
14+
type: string
15+
default: ""
16+
job_id:
17+
description: "Specific job ID to download artifacts from (optional, downloads from all jobs if not specified)"
18+
required: false
19+
type: string
20+
default: ""
1121
outputs:
1222
artifacts_url:
1323
description: "URL to retrieve build artifacts"
@@ -23,8 +33,16 @@ env:
2333
KAS_CLONE_DEPTH: 1
2434

2535
jobs:
36+
# Call the reusable workflow to download and merge nightly artifacts
37+
download-artifacts:
38+
uses: ./.github/workflows/download-nightly-artifacts.yml
39+
with:
40+
workflow_run_id: ${{ inputs.workflow_run_id }}
41+
job_id: ${{ inputs.job_id }}
42+
secrets: inherit
43+
2644
kas-setup:
27-
45+
needs: download-artifacts
2846
runs-on: [self-hosted, qcom-u2404, amd64]
2947
steps:
3048
- name: Setting up kas-container
@@ -37,15 +55,47 @@ jobs:
3755
3856
- uses: actions/checkout@v4
3957

40-
- name: Run kas lock
58+
- name: Download merged configuration
59+
if: needs.download-artifacts.outputs.success == 'true'
60+
uses: actions/download-artifact@v4
61+
with:
62+
name: ${{ needs.download-artifacts.outputs.artifact_name }}
63+
path: 'ci/'
64+
65+
- name: Display and validate
66+
if: needs.download-artifacts.outputs.success == 'true'
4167
run: |
42-
${KAS_CONTAINER} lock --update ci/qcom-robotics-distro.yml
68+
echo "📄 Merged Configuration:"
69+
echo "======================="
70+
71+
if [ -f ci/qcom-robotics-distro.yml ]; then
72+
cat ci/qcom-robotics-distro.yml
73+
else
74+
echo "❌ File not found: ci/qcom-robotics-distro.yml"
75+
echo ""
76+
echo "Available files:"
77+
find ci/ -type f
78+
exit 1
79+
fi
80+
81+
- uses: actions/checkout@v4
4382

44-
- name: Upload kas lockfile
45-
uses: actions/upload-artifact@v6
83+
- name: Download merged configuration
84+
if: needs.download-artifacts.outputs.success == 'true'
85+
uses: actions/download-artifact@v4
4686
with:
47-
name: kas-lockfile
48-
path: ci/*.lock.yml
87+
name: ${{ needs.download-artifacts.outputs.artifact_name }}
88+
path: 'ci/'
89+
90+
# - name: Run kas lock
91+
# run: |
92+
# ${KAS_CONTAINER} lock --update ci/qcom-robotics-distro.yml
93+
94+
# - name: Upload kas lockfile
95+
# uses: actions/upload-artifact@v4
96+
# with:
97+
# name: kas-lockfile
98+
# path: ci/*.lock.yml
4999

50100
- name: Upload kas-container
51101
uses: actions/upload-artifact@v4
@@ -68,7 +118,7 @@ jobs:
68118
# path: ci
69119

70120
- name: Download kas-container
71-
uses: actions/download-artifact@v6
121+
uses: actions/download-artifact@v4
72122
with:
73123
name: kas-container
74124
path: ${{ runner.temp }}
@@ -145,7 +195,7 @@ jobs:
145195
runs-on: [self-hosted, qcom-u2404, amd64]
146196
steps:
147197
- name: 'Download build URLs'
148-
uses: actions/download-artifact@v6
198+
uses: actions/download-artifact@v4
149199
with:
150200
github-token: ${{ secrets.GITHUB_TOKEN }}
151201
pattern: build-url*
@@ -199,4 +249,4 @@ jobs:
199249
with open(summary_file_name, "a") as summaryfile:
200250
summaryfile.write("## Download URLs\n")
201251
summaryfile.write(table_str)
202-
print(table_str)
252+
print(table_str)

0 commit comments

Comments
 (0)