From b210a1152b7a1bf2255847ebcf5bbd311811552d Mon Sep 17 00:00:00 2001
From: Adam Gastineau <adam@agg.im>
Date: Wed, 8 Jan 2025 05:19:57 -0800
Subject: [PATCH] Centralize Ubuntu Electron fix

---
 .github/actions/run-test/action.yml | 4 ++++
 .github/workflows/tests_others.yml  | 4 ----
 .github/workflows/tests_primary.yml | 4 ----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.github/actions/run-test/action.yml b/.github/actions/run-test/action.yml
index c193515c45..b5244ba860 100644
--- a/.github/actions/run-test/action.yml
+++ b/.github/actions/run-test/action.yml
@@ -54,6 +54,10 @@ runs:
         npx playwright install --with-deps ${{ inputs.browsers-to-install }}
         echo "::endgroup::"
       shell: bash
+    - name: Setup Ubuntu Electron
+      if: ${{ runner.os == 'Linux' }}
+      run: |
+        sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
     - name: Run tests
       if: inputs.shell == 'bash'
       run: |
diff --git a/.github/workflows/tests_others.yml b/.github/workflows/tests_others.yml
index 33380e8c19..66728e720f 100644
--- a/.github/workflows/tests_others.yml
+++ b/.github/workflows/tests_others.yml
@@ -147,10 +147,6 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
-    - name: Setup Ubuntu
-      if: ${{ runner.os == 'Linux' }}
-      run: |
-        sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
     - uses: ./.github/actions/run-test
       with:
         browsers-to-install: chromium
diff --git a/.github/workflows/tests_primary.yml b/.github/workflows/tests_primary.yml
index bf66956c4b..02847957c4 100644
--- a/.github/workflows/tests_primary.yml
+++ b/.github/workflows/tests_primary.yml
@@ -213,10 +213,6 @@ jobs:
       contents: read    # This is required for actions/checkout to succeed
     steps:
     - uses: actions/checkout@v4
-    - name: Setup Ubuntu
-      if: ${{ runner.os == 'Linux' }}
-      run: |
-        sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
     - run: npm install -g yarn@1
     - run: npm install -g pnpm@8
     - uses: ./.github/actions/run-test