Skip to content

Commit 3d8d352

Browse files
committed
yocto-check-layer.yml: Fix merge_group yocto release name
Updated the workflow to correctly determine the Yocto release name based on the event type.
1 parent e80c46c commit 3d8d352

File tree

1 file changed

+18
-4
lines changed

1 file changed

+18
-4
lines changed

.github/workflows/yocto-check-layer.yml

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,27 @@ jobs:
1414
group: meta-aws
1515
labels: meta-aws_ubuntu-latest_32-core
1616
steps:
17-
- name: get yocto release name
17+
- name: Get Yocto release name
1818
id: get-yocto-release-name
1919
env:
20+
EVENT_NAME: ${{ github.event_name }}
2021
PR_BASE_REF: ${{ github.event.pull_request.base.ref }}
22+
MERGE_GROUP_BASE_REF: ${{ github.event.merge_group.base_ref }}
23+
REF_NAME: ${{ github.ref_name }}
2124
run: |
22-
release_name=$(echo "$PR_BASE_REF" | cut -d- -f1)
23-
echo "release_name=$release_name" >> $GITHUB_OUTPUT
25+
case "$EVENT_NAME" in
26+
"pull_request")
27+
RELEASE=$(echo "$PR_BASE_REF" | cut -d- -f1)
28+
;;
29+
"merge_group")
30+
RELEASE=$(echo "$MERGE_GROUP_BASE_REF" | sed 's|refs/heads/||' | cut -d- -f1)
31+
;;
32+
*)
33+
RELEASE=$(echo "$REF_NAME" | cut -d- -f1)
34+
;;
35+
esac
36+
echo "Determined release: $RELEASE"
37+
echo "release=${RELEASE}" >> $GITHUB_OUTPUT
2438
- name: install required packages to run yocto-check-layer
2539
run: |
2640
sudo apt-get -y install gawk wget git diffstat unzip texinfo gcc build-essential chrpath socat cpio python3 xz-utils zstd liblz4-tool locales
@@ -32,7 +46,7 @@ jobs:
3246
with:
3347
path: meta-aws
3448
- name: Checkout BitBake
35-
run: git clone https://git.openembedded.org/bitbake -b ${{steps.get-yocto-release-name.outputs.release_name}}
49+
run: git clone https://git.openembedded.org/bitbake -b ${{steps.get-yocto-release-name.outputs.release}}
3650
- name: Initialize Build Environment
3751
run: |
3852
bitbake/bin/bitbake-setup --setting default top-dir-prefix /home/runner \

0 commit comments

Comments
 (0)