Skip to content

Commit 4cdeb55

Browse files
scarthgap: narrow CI and LAYERSERIES_COMPAT to scarthgap-only
First commit on the new scarthgap release branch. Per the meta-vscode release-branch policy: parse-oe-core job is dropped (poky covers scarthgap), the parse matrix collapses to just scarthgap, LAYERSERIES_COMPAT narrows to a single series, and the build job uses the matching poky branch. main keeps the broader multi-release matrix.
1 parent 9647ee1 commit 4cdeb55

2 files changed

Lines changed: 3 additions & 85 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 84 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: [scarthgap]
66
pull_request:
77
workflow_dispatch:
88

@@ -20,7 +20,7 @@ jobs:
2020
strategy:
2121
fail-fast: false
2222
matrix:
23-
poky_branch: [kirkstone, scarthgap, styhead, walnascar]
23+
poky_branch: [scarthgap]
2424
# MACHINE controls which Microsoft binary tarball the recipe
2525
# resolves to:
2626
# qemux86-64 -> linux-x64
@@ -95,88 +95,6 @@ jobs:
9595
source oe-init-build-env build
9696
bitbake -c fetch vscode
9797
98-
parse-oe-core:
99-
# whinlatter and wrynose dropped the combined poky repository, so
100-
# we clone openembedded-core + bitbake separately.
101-
name: parse (${{ matrix.release }} / ${{ matrix.machine }})
102-
runs-on: ubuntu-22.04
103-
strategy:
104-
fail-fast: false
105-
matrix:
106-
release: [whinlatter, wrynose]
107-
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.
112-
include:
113-
- release: whinlatter
114-
bitbake: '2.16'
115-
- release: wrynose
116-
bitbake: '2.18'
117-
steps:
118-
- uses: actions/checkout@v4
119-
with:
120-
path: meta-vscode
121-
122-
- name: Free disk space
123-
run: |
124-
sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc \
125-
/opt/hostedtoolcache/CodeQL /usr/local/share/boost \
126-
"$AGENT_TOOLSDIRECTORY"
127-
128-
- name: Clone oe-core (${{ matrix.release }})
129-
run: |
130-
git clone --depth 1 --branch ${{ matrix.release }} \
131-
https://git.openembedded.org/openembedded-core oe-core
132-
133-
- name: Clone bitbake (${{ matrix.bitbake }})
134-
run: |
135-
git clone --depth 1 --branch ${{ matrix.bitbake }} \
136-
https://git.openembedded.org/bitbake oe-core/bitbake
137-
138-
- name: Install Yocto host dependencies
139-
run: |
140-
sudo apt-get update
141-
sudo apt-get install -y --no-install-recommends \
142-
gawk wget git diffstat unzip texinfo gcc build-essential chrpath \
143-
socat cpio python3 python3-pip python3-pexpect xz-utils debianutils \
144-
iputils-ping python3-git python3-jinja2 python3-subunit zstd liblz4-tool \
145-
file locales libacl1
146-
sudo locale-gen en_US.UTF-8
147-
148-
- name: Parse the layer (MACHINE=${{ matrix.machine }})
149-
env:
150-
LANG: en_US.UTF-8
151-
LC_ALL: en_US.UTF-8
152-
run: |
153-
set -eo pipefail
154-
cd oe-core
155-
source oe-init-build-env build
156-
cat >> conf/local.conf <<EOF
157-
MACHINE = "${{ matrix.machine }}"
158-
BB_NUMBER_THREADS = "2"
159-
PARALLEL_MAKE = "-j 2"
160-
CONF_VERSION = "2"
161-
EOF
162-
bitbake-layers add-layer "$GITHUB_WORKSPACE/meta-vscode"
163-
bitbake-layers show-layers
164-
bitbake -p
165-
166-
- name: Fetch vscode (MACHINE=${{ matrix.machine }})
167-
env:
168-
LANG: en_US.UTF-8
169-
LC_ALL: en_US.UTF-8
170-
run: |
171-
set -eo pipefail
172-
cd oe-core
173-
source oe-init-build-env build
174-
bitbake -c fetch vscode
175-
176-
# Build vscode end-to-end on the LTS we care most about today
177-
# (scarthgap). This catches QA failures (libdir, file-rdeps, etc.)
178-
# that bitbake -p doesn't run. Single arch (x86_64) for cost; the
179-
# parse matrix above still proves the other arches' URLs resolve.
18098
build:
18199
name: build vscode (scarthgap / qemux86-64)
182100
runs-on: ubuntu-22.04

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 = "scarthgap"

0 commit comments

Comments
 (0)