Skip to content

Commit d73ad33

Browse files
wrynose: narrow CI and LAYERSERIES_COMPAT to wrynose-only
First commit on the new wrynose release branch. parse job is dropped (poky has no wrynose branch); parse-oe-core narrows to just wrynose with bitbake 2.18. build job switches from poky clone to oe-core + bitbake clones. LAYERSERIES_COMPAT narrows to a single series.
1 parent 9647ee1 commit d73ad33

2 files changed

Lines changed: 8 additions & 95 deletions

File tree

.github/workflows/ci.yml

Lines changed: 7 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: ci
22

33
on:
44
push:
5-
branches: [main, master]
5+
branches: [wrynose]
66
pull_request:
77
workflow_dispatch:
88

@@ -12,89 +12,6 @@ concurrency:
1212
cancel-in-progress: true
1313

1414
jobs:
15-
parse:
16-
# poky-the-distro covers up to walnascar; whinlatter+ no longer
17-
# publish a poky combo repo and are handled by parse-oe-core below.
18-
name: parse (${{ matrix.poky_branch }} / ${{ matrix.machine }})
19-
runs-on: ubuntu-22.04
20-
strategy:
21-
fail-fast: false
22-
matrix:
23-
poky_branch: [kirkstone, scarthgap, styhead, walnascar]
24-
# MACHINE controls which Microsoft binary tarball the recipe
25-
# resolves to:
26-
# qemux86-64 -> linux-x64
27-
# qemuarm64 -> linux-arm64
28-
# qemuarm -> linux-armhf
29-
machine: [qemux86-64, qemuarm64, qemuarm]
30-
steps:
31-
- uses: actions/checkout@v4
32-
with:
33-
path: meta-vscode
34-
35-
- name: Free disk space
36-
run: |
37-
sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc \
38-
/opt/hostedtoolcache/CodeQL /usr/local/share/boost \
39-
"$AGENT_TOOLSDIRECTORY"
40-
41-
- name: Cache poky checkout
42-
uses: actions/cache@v4
43-
with:
44-
path: poky
45-
key: poky-${{ matrix.poky_branch }}-v1
46-
restore-keys: poky-${{ matrix.poky_branch }}-
47-
48-
- name: Clone poky
49-
run: |
50-
if [ ! -d poky/.git ]; then
51-
git clone --depth 1 --branch ${{ matrix.poky_branch }} \
52-
https://git.yoctoproject.org/poky poky
53-
else
54-
git -C poky fetch --depth 1 origin \
55-
${{ matrix.poky_branch }}:refs/remotes/origin/${{ matrix.poky_branch }}
56-
git -C poky checkout -B ${{ matrix.poky_branch }} \
57-
refs/remotes/origin/${{ matrix.poky_branch }}
58-
fi
59-
60-
- name: Install Yocto host dependencies
61-
run: |
62-
sudo apt-get update
63-
sudo apt-get install -y --no-install-recommends \
64-
gawk wget git diffstat unzip texinfo gcc build-essential chrpath \
65-
socat cpio python3 python3-pip python3-pexpect xz-utils debianutils \
66-
iputils-ping python3-git python3-jinja2 python3-subunit zstd liblz4-tool \
67-
file locales libacl1
68-
sudo locale-gen en_US.UTF-8
69-
70-
- name: Parse the layer (MACHINE=${{ matrix.machine }})
71-
env:
72-
LANG: en_US.UTF-8
73-
LC_ALL: en_US.UTF-8
74-
run: |
75-
set -eo pipefail
76-
cd poky
77-
source oe-init-build-env build
78-
cat >> conf/local.conf <<EOF
79-
MACHINE = "${{ matrix.machine }}"
80-
BB_NUMBER_THREADS = "2"
81-
PARALLEL_MAKE = "-j 2"
82-
CONF_VERSION = "2"
83-
EOF
84-
bitbake-layers add-layer "$GITHUB_WORKSPACE/meta-vscode"
85-
bitbake-layers show-layers
86-
bitbake -p
87-
88-
- name: Fetch vscode (MACHINE=${{ matrix.machine }})
89-
env:
90-
LANG: en_US.UTF-8
91-
LC_ALL: en_US.UTF-8
92-
run: |
93-
set -eo pipefail
94-
cd poky
95-
source oe-init-build-env build
96-
bitbake -c fetch vscode
97-
9815
parse-oe-core:
9916
# whinlatter and wrynose dropped the combined poky repository, so
10017
# we clone openembedded-core + bitbake separately.
@@ -103,15 +20,9 @@ jobs:
10320
strategy:
10421
fail-fast: false
10522
matrix:
106-
release: [whinlatter, wrynose]
23+
release: [wrynose]
10724
machine: [qemux86-64, qemuarm64, qemuarm]
108-
# include adds the bitbake-version axis as a value-mapping
109-
# against an existing matrix axis (release); GHA pairs the
110-
# extra key (bitbake) with each existing combo that shares the
111-
# release value.
11225
include:
113-
- release: whinlatter
114-
bitbake: '2.16'
11526
- release: wrynose
11627
bitbake: '2.18'
11728
steps:
@@ -178,7 +89,7 @@ jobs:
17889
# that bitbake -p doesn't run. Single arch (x86_64) for cost; the
17990
# parse matrix above still proves the other arches' URLs resolve.
18091
build:
181-
name: build vscode (scarthgap / qemux86-64)
92+
name: build vscode (wrynose / qemux86-64)
18293
runs-on: ubuntu-22.04
18394
steps:
18495
- uses: actions/checkout@v4
@@ -191,8 +102,10 @@ jobs:
191102
/opt/hostedtoolcache/CodeQL /usr/local/share/boost \
192103
"$AGENT_TOOLSDIRECTORY"
193104
194-
- name: Clone poky (scarthgap)
195-
run: git clone --depth 1 --branch scarthgap https://git.yoctoproject.org/poky poky
105+
- name: Clone oe-core (wrynose)
106+
run: |
107+
git clone --depth 1 --branch wrynose https://git.openembedded.org/openembedded-core poky
108+
git clone --depth 1 --branch 2.18 https://git.openembedded.org/bitbake poky/bitbake
196109
197110
- name: Install Yocto host dependencies
198111
run: |

conf/layer.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ BBFILE_PRIORITY_meta-vscode = "1"
1010

1111
LAYERDEPENDS_meta-vscode = "core"
1212
LAYERVERSION_meta-vscode = "1"
13-
LAYERSERIES_COMPAT_meta-vscode = "kirkstone scarthgap styhead walnascar whinlatter wrynose"
13+
LAYERSERIES_COMPAT_meta-vscode = "wrynose"

0 commit comments

Comments
 (0)