From: tobtoht <tob@featherwallet.org>
Date: Fri, 21 Feb 2025 19:13:00 +0000 (+0100)
Subject: ci: inline guix apparmor workaround
X-Git-Url: https://git.nutra.tk/v2?a=commitdiff_plain;h=e6967fa9d2ac8b982e284cbc1a37e1f3014bb082;p=gamesguru%2Ffeather.git

ci: inline guix apparmor workaround
---

diff --git a/.github/workflows/guix b/.github/workflows/guix
deleted file mode 100644
index 1d077103..00000000
--- a/.github/workflows/guix
+++ /dev/null
@@ -1,11 +0,0 @@
-abi <abi/4.0>,
-include <tunables/global>
-
-# https://bugs.launchpad.net/ubuntu/+source/guix/+bug/2064115
-
-profile guix /usr/bin/guix flags=(unconfined) {
-  userns,
-
-  # Site-specific additions and overrides. See local/README for details.
-  include if exists <local/guix>
-}
diff --git a/.github/workflows/guix.yml b/.github/workflows/guix.yml
index 8f06f96a..08445d7f 100644
--- a/.github/workflows/guix.yml
+++ b/.github/workflows/guix.yml
@@ -56,10 +56,20 @@ jobs:
           key: sources-${{ hashFiles('contrib/depends/packages/*') }}
       - name: install dependencies
         run: sudo apt update; sudo apt -y install guix git ca-certificates apparmor-utils
-      - name: fix apparmor
-        run: sudo cp .github/workflows/guix /etc/apparmor.d/guix; sudo /etc/init.d/apparmor reload; sudo aa-enforce guix || echo "failed"
-      - name: purge apparmor
-        run: sudo apt purge apparmor
+      - name: apparmor workaround
+        # https://bugs.launchpad.net/ubuntu/+source/guix/+bug/2064115
+        run: |
+          sudo tee /etc/apparmor.d/guix << EOF
+          abi <abi/4.0>,
+          include <tunables/global>
+          profile guix /usr/bin/guix flags=(unconfined) {
+            userns,
+            include if exists <local/guix>
+          }
+          EOF
+          sudo /etc/init.d/apparmor reload
+          sudo aa-enforce guix || true
+          sudo apt purge apparmor
       - name: build
         run: SUBSTITUTE_URLS='http://bordeaux.guix.gnu.org' HOSTS="${{ matrix.toolchain.target }}" ./contrib/guix/guix-build
       - name: virustotal scan