From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sat, 6 Jul 2024 14:31:45 +0000 (+0200)
Subject: action: Remove apparmor disable logic
X-Git-Tag: v24~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90cb8d54a0c65f46f0c7462be74a4135576edddf;p=thirdparty%2Fmkosi.git

action: Remove apparmor disable logic

This is now done in GA itself so we can drop our logic.
---

diff --git a/action.yaml b/action.yaml
index 267e199db..0197b0db9 100644
--- a/action.yaml
+++ b/action.yaml
@@ -38,17 +38,6 @@ runs:
         sudo sysctl --ignore --write kernel.apparmor_restrict_unprivileged_unconfined=0
         sudo sysctl --ignore --write kernel.apparmor_restrict_unprivileged_userns=0
 
-  # Both the unix-chkpwd and swtpm profiles are broken (https://gitlab.com/apparmor/apparmor/-/issues/402) so let's
-  # just disable and remove apparmor completely. It's not relevant in this context anyway.
-  # TODO: Remove if https://github.com/actions/runner-images/issues/10015 is ever fixed.
-  - name: Disable and mask apparmor service
-    shell: bash
-    run: |
-        # This command fails with a non-zero error code even though it unloads the apparmor profiles.
-        # https://gitlab.com/apparmor/apparmor/-/issues/403
-        sudo aa-teardown || true
-        sudo apt-get remove apparmor
-
   - name: Dependencies
     shell: bash
     run: |