@@ -110,7 +110,7 @@ jobs:
110110 flavor : ${{ fromJson(needs.prepare.outputs.live_flavors) }}
111111
112112 container :
113- image : ' ghcr.io/void-linux/void-glibc-full:20231230R1 '
113+ image : ' ghcr.io/void-linux/void-mklive:20250116R1 '
114114 options : --privileged
115115 volumes :
116116 - /dev:/dev
@@ -121,13 +121,8 @@ jobs:
121121 steps :
122122 - name : Prepare container
123123 shell : sh
124- run : |
125- # Switch to mirror
126- mkdir -p /etc/xbps.d && cp /usr/share/xbps.d/*-repository-*.conf /etc/xbps.d/
127- sed -i 's|https://repo-default.voidlinux.org/current|'"${{ needs.prepare.outputs.mirror }}"'|g' \
128- /etc/xbps.d/*-repository-*.conf
129- xbps-install -Syu xbps && xbps-install -yu
130- xbps-install -yu bash make git kmod xz lzo qemu-user-aarch64 binfmt-support outils dosfstools e2fsprogs
124+ run : xbps-install -Syu xbps && xbps-install -yu
125+
131126 - name : Clone and checkout
132127 uses : classabbyamp/treeless-checkout-action@v1
133128
@@ -160,7 +155,7 @@ jobs:
160155 arch : ${{ fromJson(needs.prepare.outputs.rootfs) }}
161156
162157 container :
163- image : ' ghcr.io/void-linux/void-glibc-full:20231230R1 '
158+ image : ' ghcr.io/void-linux/void-mklive:20250116R1 '
164159 options : --privileged
165160 volumes :
166161 - /dev:/dev
@@ -171,13 +166,8 @@ jobs:
171166 steps :
172167 - name : Prepare container
173168 shell : sh
174- run : |
175- # Switch to mirror
176- mkdir -p /etc/xbps.d && cp /usr/share/xbps.d/*-repository-*.conf /etc/xbps.d/
177- sed -i 's|https://repo-default.voidlinux.org/current|'"${{ needs.prepare.outputs.mirror }}"'|g' \
178- /etc/xbps.d/*-repository-*.conf
179- xbps-install -Syu xbps && xbps-install -yu
180- xbps-install -yu bash make git kmod xz lzo qemu-user-arm qemu-user-aarch64 binfmt-support outils dosfstools e2fsprogs
169+ run : xbps-install -Syu xbps && xbps-install -yu
170+
181171 - name : Clone and checkout
182172 uses : classabbyamp/treeless-checkout-action@v1
183173
@@ -210,7 +200,7 @@ jobs:
210200 platform : ${{ fromJson(needs.prepare.outputs.platformfs) }}
211201
212202 container :
213- image : ' ghcr.io/void-linux/void-glibc-full:20231230R1 '
203+ image : ' ghcr.io/void-linux/void-mklive:20250116R1 '
214204 options : --privileged
215205 volumes :
216206 - /dev:/dev
@@ -221,13 +211,8 @@ jobs:
221211 steps :
222212 - name : Prepare container
223213 shell : sh
224- run : |
225- # Switch to mirror
226- mkdir -p /etc/xbps.d && cp /usr/share/xbps.d/*-repository-*.conf /etc/xbps.d/
227- sed -i 's|https://repo-default.voidlinux.org/current|'"${{ needs.prepare.outputs.mirror }}"'|g' \
228- /etc/xbps.d/*-repository-*.conf
229- xbps-install -Syu xbps && xbps-install -yu
230- xbps-install -yu bash make git kmod xz lzo qemu-user-arm qemu-user-aarch64 binfmt-support outils dosfstools e2fsprogs
214+ run : xbps-install -Syu xbps && xbps-install -yu
215+
231216 - name : Clone and checkout
232217 uses : classabbyamp/treeless-checkout-action@v1
233218
@@ -261,7 +246,7 @@ jobs:
261246 platform : ${{ fromJson(needs.prepare.outputs.sbc_imgs) }}
262247
263248 container :
264- image : ' ghcr.io/void-linux/void-glibc-full:20231230R1 '
249+ image : ' ghcr.io/void-linux/void-mklive:20250116R1 '
265250 options : --privileged
266251 volumes :
267252 - /dev:/dev
@@ -272,13 +257,8 @@ jobs:
272257 steps :
273258 - name : Prepare container
274259 shell : sh
275- run : |
276- # Switch to mirror
277- mkdir -p /etc/xbps.d && cp /usr/share/xbps.d/*-repository-*.conf /etc/xbps.d/
278- sed -i 's|https://repo-default.voidlinux.org/current|'"${{ needs.prepare.outputs.mirror }}"'|g' \
279- /etc/xbps.d/*-repository-*.conf
280- xbps-install -Syu xbps && xbps-install -yu
281- xbps-install -yu bash make git kmod xz lzo qemu-user-arm qemu-user-aarch64 binfmt-support outils dosfstools e2fsprogs
260+ run : xbps-install -Syu xbps && xbps-install -yu
261+
282262 - name : Clone and checkout
283263 uses : classabbyamp/treeless-checkout-action@v1
284264
@@ -314,25 +294,16 @@ jobs:
314294 - build-sbc-img
315295
316296 container :
317- image : ' ghcr.io/void-linux/void-glibc-full:20231230R1 '
297+ image : ' ghcr.io/void-linux/void-mklive:20250116R1 '
318298 env :
319299 PATH : ' /usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
320300 MKLIVE_REV : " ${{ needs.prepare.outputs.revision }}"
321301
322302 steps :
323303 - name : Prepare container
324304 shell : sh
325- run : |
326- # Switch to mirror
327- mkdir -p /etc/xbps.d && cp /usr/share/xbps.d/*-repository-*.conf /etc/xbps.d/
328- sed -i 's|https://repo-default.voidlinux.org/current|'"${{ needs.prepare.outputs.mirror }}"'|g' \
329- /etc/xbps.d/*-repository-*.conf
330- # Sync and upgrade once, assume error comes from xbps update
331- xbps-install -Syu || xbps-install -yu xbps
332- # Upgrade again (in case there was a xbps update)
333- xbps-install -yu
334- # Install depedencies
335- xbps-install -yu bash make git outils
305+ run : xbps-install -Syu xbps && xbps-install -yu
306+
336307 - name : Clone and checkout
337308 uses : classabbyamp/treeless-checkout-action@v1
338309
0 commit comments