From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 25 Feb 2022 10:42:34 +0000 (+0000)
Subject: ci: Remove nspawn Arch workaround
X-Git-Tag: v13~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a20c0b02bc470ace4ed33f179342beb32c18f13a;p=thirdparty%2Fmkosi.git

ci: Remove nspawn Arch workaround
---

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0ed8f05f6..193b27bf1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -233,20 +233,6 @@ jobs:
         sync-uri = https://raw.githubusercontent.com/257/binpkgs/main
         EOF
 
-    # Ubuntu's systemd-nspawn doesn't support faccessat2() syscall, which is
-    # required, since current Arch's glibc implements faccessat() via faccessat2().
-    - name: Update systemd-nspawn
-      if: ${{ matrix.distro == 'arch' }}
-      run: |
-        echo "deb-src http://archive.ubuntu.com/ubuntu/ $(lsb_release -cs) main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
-        sudo apt update
-        sudo apt build-dep systemd
-        git clone https://github.com/systemd/systemd --depth=1 && cd systemd
-        meson build
-        ninja -C build
-        sudo ln -svf $PWD/build/systemd-nspawn `which systemd-nspawn`
-        systemd-nspawn --version
-
     - name: Build ${{ matrix.distro }}/${{ matrix.format }}
       run: |
         sudo python3 -m mkosi build