mirror of
https://github.com/CyberMind-FR/secubox-deb.git
synced 2026-07-29 18:36:55 +00:00
Fix CI arm64 builds and live USB directory creation
- Skip arm64 builds for Architecture: all packages (redundant) - Remove QEMU cross-compilation setup (not needed for arch-all) - Fix missing /esp/live directory in build-live-usb.sh Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
parent
62f591e23d
commit
d76d57a8cf
50
.github/workflows/build-packages.yml
vendored
50
.github/workflows/build-packages.yml
vendored
|
|
@ -65,28 +65,36 @@ jobs:
|
|||
if: ${{ github.event.inputs.package != '' && github.event.inputs.package != matrix.package }}
|
||||
run: echo "Skipping ${{ matrix.package }}" && exit 0
|
||||
|
||||
- name: Setup QEMU for arm64
|
||||
if: matrix.arch == 'arm64'
|
||||
uses: docker/setup-qemu-action@v3
|
||||
with:
|
||||
platforms: arm64
|
||||
- name: Check if arch-all package
|
||||
id: check-arch
|
||||
run: |
|
||||
if [ -f "packages/${{ matrix.package }}/debian/control" ]; then
|
||||
if grep -q "Architecture: all" "packages/${{ matrix.package }}/debian/control"; then
|
||||
echo "is_arch_all=true" >> $GITHUB_OUTPUT
|
||||
else
|
||||
echo "is_arch_all=false" >> $GITHUB_OUTPUT
|
||||
fi
|
||||
else
|
||||
echo "is_arch_all=true" >> $GITHUB_OUTPUT
|
||||
fi
|
||||
|
||||
- name: Skip arm64 for arch-all packages
|
||||
if: matrix.arch == 'arm64' && steps.check-arch.outputs.is_arch_all == 'true'
|
||||
run: |
|
||||
echo "⏭ Skipping arm64 build for Architecture: all package"
|
||||
echo " arch-all packages are architecture-independent"
|
||||
exit 0
|
||||
|
||||
- name: Install build dependencies
|
||||
if: "!(matrix.arch == 'arm64' && steps.check-arch.outputs.is_arch_all == 'true')"
|
||||
run: |
|
||||
sudo apt-get update -qq
|
||||
sudo apt-get install -y -qq \
|
||||
build-essential dpkg-dev debhelper devscripts fakeroot \
|
||||
qemu-user-static binfmt-support \
|
||||
dh-python python3-all python3-setuptools
|
||||
if [[ "${{ matrix.arch }}" == "arm64" ]]; then
|
||||
sudo dpkg --add-architecture arm64
|
||||
sudo apt-get update -qq
|
||||
sudo apt-get install -y -qq crossbuild-essential-arm64
|
||||
# Install arm64 Python for cross-compilation of Python packages
|
||||
sudo apt-get install -y -qq python3-all:arm64 || true
|
||||
fi
|
||||
|
||||
- name: Build ${{ matrix.package }} (${{ matrix.arch }})
|
||||
if: "!(matrix.arch == 'arm64' && steps.check-arch.outputs.is_arch_all == 'true')"
|
||||
run: |
|
||||
cd packages/${{ matrix.package }}
|
||||
|
||||
|
|
@ -95,29 +103,19 @@ jobs:
|
|||
exit 0
|
||||
fi
|
||||
|
||||
# Check if this is a Python package (Architecture: all)
|
||||
IS_ARCH_ALL=$(grep -q "Architecture: all" debian/control && echo "yes" || echo "no")
|
||||
|
||||
if [[ "${{ matrix.arch }}" == "arm64" ]]; then
|
||||
if [[ "$IS_ARCH_ALL" == "yes" ]]; then
|
||||
# Python/arch-all packages: use -d to skip cross-build deps
|
||||
dpkg-buildpackage -us -uc -b -d
|
||||
else
|
||||
dpkg-buildpackage --host-arch arm64 --target-arch arm64 -us -uc -b
|
||||
fi
|
||||
else
|
||||
dpkg-buildpackage -us -uc -b
|
||||
fi
|
||||
dpkg-buildpackage -us -uc -b
|
||||
|
||||
echo "✅ Build OK: ${{ matrix.package }} (${{ matrix.arch }})"
|
||||
|
||||
- name: Collect artifacts
|
||||
if: "!(matrix.arch == 'arm64' && steps.check-arch.outputs.is_arch_all == 'true')"
|
||||
run: |
|
||||
mkdir -p artifacts
|
||||
find packages/ -maxdepth 1 -name "*.deb" -exec cp {} artifacts/ \;
|
||||
ls -lh artifacts/ || echo "No .deb files"
|
||||
|
||||
- name: Upload artifacts
|
||||
if: "!(matrix.arch == 'arm64' && steps.check-arch.outputs.is_arch_all == 'true')"
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: ${{ matrix.package }}-${{ matrix.arch }}
|
||||
|
|
|
|||
|
|
@ -472,7 +472,7 @@ mount "${LOOP}p2" "${MNT}/live"
|
|||
cp -r "${LIVE_DIR}/live" "${MNT}/live/"
|
||||
|
||||
# Setup GRUB EFI
|
||||
mkdir -p "${MNT}/esp/EFI/BOOT" "${MNT}/esp/boot/grub"
|
||||
mkdir -p "${MNT}/esp/EFI/BOOT" "${MNT}/esp/boot/grub" "${MNT}/esp/live"
|
||||
|
||||
# GRUB configuration
|
||||
cat > "${MNT}/esp/boot/grub/grub.cfg" <<'EOF'
|
||||
|
|
|
|||
1
wget-log
1
wget-log
|
|
@ -1 +0,0 @@
|
|||
2026-03-20 19:31:22 URL:http://deb.debian.org/debian/dists/bookworm/InRelease [151078/151078] -> "/tmp/secubox-build-5dVZEY/rootfs/var/lib/apt/lists/partial/deb.debian.org_debian_dists_bookworm_InRelease" [1]
|
||||
|
|
@ -1 +0,0 @@
|
|||
2026-03-20 19:31:23 URL:http://deb.debian.org/debian/dists/bookworm/main/binary-arm64/by-hash/SHA256/3422286d4340167769632b1da5abdb2dc399eab71407155eee56f1df5dc63540 [8690780/8690780] -> "/tmp/secubox-build-5dVZEY/rootfs/var/lib/apt/lists/partial/deb.debian.org_debian_dists_bookworm_main_binary-arm64_Packages.xz" [1]
|
||||
|
|
@ -1 +0,0 @@
|
|||
2026-03-21 05:51:56 URL:http://deb.debian.org/debian/dists/bookworm/InRelease [151078/151078] -> "/tmp/secubox-build-bSyoGN/rootfs/var/lib/apt/lists/partial/deb.debian.org_debian_dists_bookworm_InRelease" [1]
|
||||
|
|
@ -1 +0,0 @@
|
|||
2026-03-21 05:51:58 URL:http://deb.debian.org/debian/dists/bookworm/main/binary-arm64/by-hash/SHA256/3422286d4340167769632b1da5abdb2dc399eab71407155eee56f1df5dc63540 [8690780/8690780] -> "/tmp/secubox-build-bSyoGN/rootfs/var/lib/apt/lists/partial/deb.debian.org_debian_dists_bookworm_main_binary-arm64_Packages.xz" [1]
|
||||
|
|
@ -1 +0,0 @@
|
|||
2026-03-21 06:01:39 URL:http://deb.debian.org/debian/dists/bookworm/InRelease [151078/151078] -> "/tmp/secubox-build-bkRIax/rootfs/var/lib/apt/lists/partial/deb.debian.org_debian_dists_bookworm_InRelease" [1]
|
||||
|
|
@ -1 +0,0 @@
|
|||
2026-03-21 06:01:40 URL:http://deb.debian.org/debian/dists/bookworm/main/binary-amd64/by-hash/SHA256/74ba52142a25572b51596f22e6652dbcdd59ce29477e91f0bfdd491e1ecd046f [8791704/8791704] -> "/tmp/secubox-build-bkRIax/rootfs/var/lib/apt/lists/partial/deb.debian.org_debian_dists_bookworm_main_binary-amd64_Packages.xz" [1]
|
||||
|
|
@ -1 +0,0 @@
|
|||
2026-03-21 06:52:17 URL:http://deb.debian.org/debian/dists/bookworm/InRelease [151078/151078] -> "/tmp/secubox-build-MSEkVb/rootfs/var/lib/apt/lists/partial/deb.debian.org_debian_dists_bookworm_InRelease" [1]
|
||||
|
|
@ -1 +0,0 @@
|
|||
2026-03-21 06:52:18 URL:http://deb.debian.org/debian/dists/bookworm/main/binary-amd64/by-hash/SHA256/74ba52142a25572b51596f22e6652dbcdd59ce29477e91f0bfdd491e1ecd046f [8791704/8791704] -> "/tmp/secubox-build-MSEkVb/rootfs/var/lib/apt/lists/partial/deb.debian.org_debian_dists_bookworm_main_binary-amd64_Packages.xz" [1]
|
||||
Loading…
Reference in New Issue
Block a user