Skip to content

Commit dbec5c7

Browse files
Josua-SRJosua-SR
committed
ci: update publish location, speed up compression
1 parent 0793182 commit dbec5c7

File tree

1 file changed

+35
-30
lines changed

1 file changed

+35
-30
lines changed

‎.github/workflows/build.yml‎

Lines changed: 35 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ jobs:
110110
EULA=1
111111
. ./setup-env -m lx2160ardb-rev2 -b build
112112
printf 'BBLAYERS += "%s"\n' $GITHUB_WORKSPACE/sources/meta-solidrun-arm-lx2xxx >> conf/bblayers.conf
113+
echo "TMPDIR = \"\${TOPDIR}/tmp-\${MACHINE}\"" >> conf/local.conf
113114
echo "require conf/includes/ci.conf" >> conf/local.conf
114115
115116
- name: Download Sources (ignore errors)
@@ -144,7 +145,7 @@ jobs:
144145
wic create -m -o wic-$MACHINE lx2160a-rootimg -e $IMAGE
145146
ln -sv wic-$MACHINE/lx2160a-rootimg.wks*.direct $IMAGE-$MACHINE-rootimg.wic
146147
ln -sv wic-$MACHINE/lx2160a-rootimg.wks*.direct.bmap $IMAGE-$MACHINE-rootimg.wic.bmap
147-
ls -lh tmp/deploy/images/$MACHINE
148+
ls -lh tmp-$MACHINE/deploy/images/$MACHINE
148149
export MACHINE=lx2160a-rev2-honeycomb
149150
bitbake -k $IMAGE
150151
wic create -m -o wic-$MACHINE lx2160a-bootimg-mmc -e $IMAGE
@@ -156,7 +157,7 @@ jobs:
156157
wic create -m -o wic-$MACHINE lx2160a-rootimg -e $IMAGE
157158
ln -sv wic-$MACHINE/lx2160a-rootimg.wks*.direct $IMAGE-$MACHINE-rootimg.wic
158159
ln -sv wic-$MACHINE/lx2160a-rootimg.wks*.direct.bmap $IMAGE-$MACHINE-rootimg.wic.bmap
159-
ls -lh tmp/deploy/images/$MACHINE
160+
ls -lh tmp-$MACHINE/deploy/images/$MACHINE
160161
export MACHINE=lx2162a-rev2-clearfog
161162
bitbake -k $IMAGE
162163
wic create -m -o wic-$MACHINE lx2160a-bootimg-mmc -e $IMAGE
@@ -168,12 +169,12 @@ jobs:
168169
wic create -m -o wic-$MACHINE lx2160a-rootimg -e $IMAGE
169170
ln -sv wic-$MACHINE/lx2160a-rootimg.wks*.direct $IMAGE-$MACHINE-rootimg.wic
170171
ln -sv wic-$MACHINE/lx2160a-rootimg.wks*.direct.bmap $IMAGE-$MACHINE-rootimg.wic.bmap
171-
ls -lh tmp/deploy/images/$MACHINE
172+
ls -lh tmp-$MACHINE/deploy/images/$MACHINE
172173
export MACHINE=lx2160a-rev2-clearfog-cx
173174
bitbake -k vpp-oci-image
174-
ln -sv tmp/deploy/images/$MACHINE/vpp-oci-image-$MACHINE-*.rootfs-oci.tar vpp-oci-image-lx216x.rootfs-oci.tar
175-
ln -sv tmp/deploy/images/$MACHINE/vpp-oci-image-$MACHINE-*.rootfs.manifest vpp-oci-image-lx216x.rootfs.manifest
176-
ls -lh tmp/deploy/images/$MACHINE
175+
ln -sv tmp-$MACHINE/deploy/images/$MACHINE/vpp-oci-image-$MACHINE-*.rootfs-oci.tar vpp-oci-image-lx216x.rootfs-oci.tar
176+
ln -sv tmp-$MACHINE/deploy/images/$MACHINE/vpp-oci-image-$MACHINE-*.rootfs.manifest vpp-oci-image-lx216x.rootfs.manifest
177+
ls -lh tmp-$MACHINE/deploy/images/$MACHINE
177178
ls -lh
178179
continue-on-error: true
179180

@@ -201,40 +202,44 @@ jobs:
201202
- name: Select artifacts for publishing
202203
shell: bash -e {0}
203204
run: |
204-
export IMAGE=fsl-image-networking-full
205-
export MACHINE=lx2160a-rev2-clearfog-cx
205+
IMAGE=fsl-image-networking-full
206+
MACHINE=lx2160a-rev2-clearfog-cx
207+
IMAGEDIR=build/tmp-$MACHINE/deploy/images/$MACHINE
206208
mkdir deploy
207-
cp -L build/tmp/deploy/images/$MACHINE/$IMAGE-$MACHINE.ext2.gz deploy
208-
cp -L build/tmp/deploy/images/$MACHINE/$IMAGE-$MACHINE.manifest deploy
209-
pushd build/tmp/deploy/images/$MACHINE; tar -cpzf device-tree-$MACHINE.tgz freescale/*.dtb; popd
210-
mv build/tmp/deploy/images/$MACHINE/device-tree-$MACHINE.tgz deploy
211-
cp -L build/tmp/deploy/images/$MACHINE/Image deploy/Image-$MACHINE
212-
cp -L build/tmp/deploy/images/$MACHINE/modules-$MACHINE.tgz deploy
209+
cp -L $IMAGEDIR/$IMAGE-$MACHINE.ext2.gz deploy
210+
cp -L $IMAGEDIR/$IMAGE-$MACHINE.manifest deploy
211+
pushd $IMAGEDIR; tar -cpzf device-tree-$MACHINE.tgz freescale/*.dtb; popd
212+
mv $IMAGEDIR/device-tree-$MACHINE.tgz deploy
213+
cp -L $IMAGEDIR/Image deploy/Image-$MACHINE
214+
cp -L $IMAGEDIR/modules-$MACHINE.tgz deploy
213215
cp -L build/$IMAGE-$MACHINE-bootimg-mmc.wic* deploy
214216
cp -L build/$IMAGE-$MACHINE-bootimg-xspi.wic* deploy
215217
cp -L build/$IMAGE-$MACHINE-rootimg.wic* deploy
216-
export MACHINE=lx2160a-rev2-honeycomb
217-
cp -L build/tmp/deploy/images/$MACHINE/$IMAGE-$MACHINE.ext2.gz deploy
218-
cp -L build/tmp/deploy/images/$MACHINE/$IMAGE-$MACHINE.manifest deploy
219-
pushd build/tmp/deploy/images/$MACHINE; tar -cpzf device-tree-$MACHINE.tgz freescale/*.dtb; popd
220-
mv build/tmp/deploy/images/$MACHINE/device-tree-$MACHINE.tgz deploy
221-
cp -L build/tmp/deploy/images/$MACHINE/Image deploy/Image-$MACHINE
222-
cp -L build/tmp/deploy/images/$MACHINE/modules-$MACHINE.tgz deploy
218+
MACHINE=lx2160a-rev2-honeycomb
219+
IMAGEDIR=build/tmp-$MACHINE/deploy/images/$MACHINE
220+
cp -L $IMAGEDIR/$IMAGE-$MACHINE.ext2.gz deploy
221+
cp -L $IMAGEDIR/$IMAGE-$MACHINE.manifest deploy
222+
pushd $IMAGEDIR; tar -cpzf device-tree-$MACHINE.tgz freescale/*.dtb; popd
223+
mv $IMAGEDIR/device-tree-$MACHINE.tgz deploy
224+
cp -L $IMAGEDIR/Image deploy/Image-$MACHINE
225+
cp -L $IMAGEDIR/modules-$MACHINE.tgz deploy
223226
cp -L build/$IMAGE-$MACHINE-bootimg-mmc.wic* deploy
224227
cp -L build/$IMAGE-$MACHINE-bootimg-xspi.wic* deploy
225228
cp -L build/$IMAGE-$MACHINE-rootimg.wic* deploy
226-
export MACHINE=lx2162a-rev2-clearfog
227-
cp -L build/tmp/deploy/images/$MACHINE/$IMAGE-$MACHINE.ext2.gz deploy
228-
cp -L build/tmp/deploy/images/$MACHINE/$IMAGE-$MACHINE.manifest deploy
229-
pushd build/tmp/deploy/images/$MACHINE; tar -cpzf device-tree-$MACHINE.tgz freescale/*.dtb; popd
230-
mv build/tmp/deploy/images/$MACHINE/device-tree-$MACHINE.tgz deploy
231-
cp -L build/tmp/deploy/images/$MACHINE/Image deploy/Image-$MACHINE
232-
cp -L build/tmp/deploy/images/$MACHINE/modules-$MACHINE.tgz deploy
229+
MACHINE=lx2162a-rev2-clearfog
230+
IMAGEDIR=build/tmp-$MACHINE/deploy/images/$MACHINE
231+
cp -L $IMAGEDIR/$IMAGE-$MACHINE.ext2.gz deploy
232+
cp -L $IMAGEDIR/$IMAGE-$MACHINE.manifest deploy
233+
pushd $IMAGEDIR; tar -cpzf device-tree-$MACHINE.tgz freescale/*.dtb; popd
234+
mv $IMAGEDIR/device-tree-$MACHINE.tgz deploy
235+
cp -L $IMAGEDIR/Image deploy/Image-$MACHINE
236+
cp -L $IMAGEDIR/modules-$MACHINE.tgz deploy
233237
cp -L build/$IMAGE-$MACHINE-bootimg-mmc.wic* deploy
234238
cp -L build/$IMAGE-$MACHINE-bootimg-xspi.wic* deploy
235239
cp -L build/$IMAGE-$MACHINE-rootimg.wic* deploy
236240
cp -L build/vpp-oci-image-lx216x.rootfs-oci.tar build/vpp-oci-image-lx216x.rootfs.manifest deploy
237-
xz -9 deploy/*.wic
241+
find deploy -maxdepth 1 -type f -iname "*.wic" -print0 | xargs -0 -n 1 -P 0 echo xz -9 -T 16
242+
find deploy -maxdepth 1 -type f -iname "*.wic" -print0 | xargs -0 -n 1 -P 0 xz -9 -T 16
238243
ls -lh deploy/*
239244
240245
- name: Deploy to the local minio storage
@@ -274,4 +279,4 @@ jobs:
274279
aws_bucket: ${{ secrets.IMAGES_S3_BUCKET }}
275280
endpoint: ${{ secrets.IMAGES_S3_HOST }}
276281
source_dir: deploy
277-
destination_dir: LX2k/meta-solidrun-arm-lx2xxx/${{ needs.build_images.outputs.build_tag }}
282+
destination_dir: LX2k/meta-solidrun-arm-lx2xxx/kirkstone-ls-5.15.71-2.2.0/${{ needs.build_images.outputs.build_tag }}

0 commit comments

Comments
 (0)