ci: Update dependency versions

diff --git a/action.yaml b/action.yaml
index 73ab4076dd99f37d6a06f01d6c8e9e7b57493c6e..9295958fba9dafdac3876a61c3ee35560086973c 100644 (file)
--- a/action.yaml
+++ b/action.yaml
@@ -8,7 +8,7 @@ runs:
   - name: Cache dependencies
     uses: actions/cache@v3
     with:
-      path: build/
+      path: build
       key: ${{ runner.os }}-${{ hashFiles('action/setup-github-actions.sh') }}
 
   - name: Dependencies

diff --git a/action/mkosi.default b/action/mkosi.default
index 8af73cc7b486ba0b7138466127ab50d52a9fb315..4da4a03a669613ff215b18492d1c16175c0f5faa 100644 (file)
--- a/action/mkosi.default
+++ b/action/mkosi.default
@@ -14,6 +14,7 @@ Autologin=yes
 Bootable=yes
 Password=
 Packages=bzip2
+         clang
          debootstrap
          e2fsprogs
          git
@@ -38,10 +39,12 @@ Packages=bzip2
          libxml2
          libyaml-0-2
          libzstd1
+         python-is-python3
          python3
          python3-distutils
          python3-gpg
          python3-setuptools
+         rustc
          squashfs-tools
          systemd-container
          xfsprogs

diff --git a/action/setup-github-actions.sh b/action/setup-github-actions.sh
index 49be038ee4210b479a010d02fe88746c71d6f565..6d7ca7ec437fa5fac67c89c3bd37c0ea102d0ff6 100755 (executable)
--- a/action/setup-github-actions.sh
+++ b/action/setup-github-actions.sh
@@ -2,16 +2,18 @@
 set -e
 
 PACMAN_VERSION="6.0.1"
-ARCHLINUX_KEYRING_VERSION="20210902"
+ARCHLINUX_KEYRING_COMMIT="29dc5d228d033929f90af14d219487b1edc4c2c0"
 RPM_VERSION="4.17.0"
-LIBCOMPS_VERSION="0.1.17"
+LIBCOMPS_VERSION="0.1.18"
 LIBREPO_VERSION="1.14.2"
-LIBMODULEMD_VERSION="2.13.0"
-LIBSOLV_VERSION="0.7.19"
-LIBDNF_VERSION="0.63.1"
-DNF_VERSION="4.8.0"
+LIBMODULEMD_VERSION="2.14.0"
+LIBSOLV_VERSION="0.7.22"
+LIBDNF_VERSION="0.66.0"
+DNF_VERSION="4.11.1"
+SEQUOIA_SQ_VERSION="0.26.0"
 
 export CMAKE_GENERATOR=Ninja
+export CARGO_HOME=cargo
 
 # All built libraries are installed to both $DESTDIR and /usr so they appear in
 # the final image and can be found by the build scripts of the libraries and
@@ -28,6 +30,7 @@ apt-get --assume-yes --no-install-recommends install \
         automake \
         autopoint \
         check \
+        cargo \
         cmake \
         debootstrap \
         docbook-xsl \
@@ -77,7 +80,10 @@ apt-get --assume-yes --no-install-recommends install \
         xfsprogs \
         xsltproc \
         zlib1g-dev \
-        zypper
+        zypper \
+        libclang-dev \
+        nettle-dev \
+        capnproto
 
 cd "$BUILDDIR"
 
@@ -100,12 +106,15 @@ fi
 
 meson install -C pacman-$PACMAN_VERSION-build
 
-if [ ! -f archlinux-keyring-$ARCHLINUX_KEYRING_VERSION.tar.gz ]; then
-    wget https://sources.archlinux.org/other/archlinux-keyring/archlinux-keyring-$ARCHLINUX_KEYRING_VERSION.tar.gz
-    tar xf archlinux-keyring-$ARCHLINUX_KEYRING_VERSION.tar.gz
+cargo install sequoia-sq --version $SEQUOIA_SQ_VERSION --features 'crypto-nettle compression-bzip2 autocrypt' --target-dir .
+install -Dm 755 "$CARGO_HOME"/bin/sq -t /usr/bin
+
+if [ ! -d archlinux-keyring-$ARCHLINUX_KEYRING_COMMIT ]; then
+    git clone https://gitlab.archlinux.org/archlinux/archlinux-keyring.git archlinux-keyring-$ARCHLINUX_KEYRING_COMMIT
+    git -C archlinux-keyring-$ARCHLINUX_KEYRING_COMMIT checkout $ARCHLINUX_KEYRING_COMMIT
 fi
 
-make -C archlinux-keyring-$ARCHLINUX_KEYRING_VERSION PREFIX=/usr install
+make -C archlinux-keyring-$ARCHLINUX_KEYRING_COMMIT PREFIX=/usr install
 
 if [ ! -f rpm-$RPM_VERSION-release.tar.gz ]; then
     wget https://github.com/rpm-software-management/rpm/archive/refs/tags/rpm-$RPM_VERSION-release.tar.gz