From c6e4dc3edb0b9dce84f68b101df87aa34c2dd603 Mon Sep 17 00:00:00 2001 From: nl6720 Date: Wed, 1 May 2024 09:19:52 +0300 Subject: [PATCH] .github/workflows/main.yml: update bootstrap tarball extension Starting with the 2024.05.01 release, the Arch Linux bootstrap tarball uses zstd compression. Related to https://gitlab.archlinux.org/archlinux/archiso/-/issues/130 --- .github/workflows/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5df8083d..5965d895 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -57,8 +57,8 @@ jobs: - name: Download latest ArchISO bootstrap image run: | - echo "Downloading archlinux-bootstrap-x86_64.tar.gz" - curl -LO "https://geo.mirror.pkgbuild.com/iso/latest/archlinux-bootstrap-x86_64.tar.gz" + echo "Downloading archlinux-bootstrap-x86_64.tar.zst" + curl -LO "https://geo.mirror.pkgbuild.com/iso/latest/archlinux-bootstrap-x86_64.tar.zst" - name: Create new raw image for Arch Linux and mount it as a loop device run: | @@ -81,7 +81,7 @@ jobs: - name: Prepare arch-bootstrap directory, chroot into it and install Arch with SELinux support to loop-mounted raw image run: | - sudo tar xf archlinux-bootstrap-x86_64.tar.gz -C /tmp/boots --strip-components 1 + sudo tar xf archlinux-bootstrap-x86_64.tar.zst -C /tmp/boots --strip-components 1 sudo cp -v repo/* /tmp/boots/var/cache/pacman/pkg sudo /tmp/boots/usr/bin/arch-chroot /tmp/boots /bin/bash -ex -c \ 'pacman-key --init; @@ -179,9 +179,9 @@ jobs: - name: Prepare Arch specific binaries for use run: | mkdir -v /tmp/boots - echo "Downloading archlinux-bootstrap-x86_64.tar.gz" - curl -LO "https://geo.mirror.pkgbuild.com/iso/latest/archlinux-bootstrap-x86_64.tar.gz" - sudo tar xf archlinux-bootstrap-x86_64.tar.gz -C /tmp/boots --strip-components 1 + echo "Downloading archlinux-bootstrap-x86_64.tar.zst" + curl -LO "https://geo.mirror.pkgbuild.com/iso/latest/archlinux-bootstrap-x86_64.tar.zst" + sudo tar xf archlinux-bootstrap-x86_64.tar.zst -C /tmp/boots --strip-components 1 mkdir -v /tmp/boots/repo - name: Get the SELinux packages from build job