From ede6a169e0b8637b7f837c9891112e04f8f52bd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Gro=C3=9F?= <julian.g@posteo.de>
Date: Thu, 11 May 2023 12:35:39 +0200
Subject: [PATCH 1/2] Revert "Do not clear working directory"

This reverts commit 0f60e35d26d890385a79bda783de3bfad392d620.
---
 .github/workflows/pr_build.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml
index 39ca5b449a..13daa88831 100644
--- a/.github/workflows/pr_build.yml
+++ b/.github/workflows/pr_build.yml
@@ -155,6 +155,12 @@ jobs:
           echo "INSTALLER=Overte-Interface-$RELEASE_NUMBER-${GIT_COMMIT_SHORT}.$INSTALLER_EXT" >> $GITHUB_ENV
         fi
 
+    - name: Clear Working Directory
+      if: startsWith(matrix.os, 'windows') || contains(matrix.os, 'self-hosted')
+      shell: bash
+      working-directory: ${{runner.workspace}}
+      run: rm -rf ./*
+
     - uses: actions/checkout@v3
       with:
         submodules: false

From db8e69da9e8a18fd817b939a238d716ed20cb79c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Gro=C3=9F?= <julian.g@posteo.de>
Date: Mon, 15 May 2023 21:01:19 +0200
Subject: [PATCH 2/2] Clear working directory on self hosted aarch64 runner.

---
 .github/workflows/linux_server_build.yml | 10 ++++++++++
 .github/workflows/pr_build.yml           |  8 ++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/linux_server_build.yml b/.github/workflows/linux_server_build.yml
index 2f7173720c..b6be8dd418 100644
--- a/.github/workflows/linux_server_build.yml
+++ b/.github/workflows/linux_server_build.yml
@@ -89,6 +89,11 @@ jobs:
     container: ${{matrix.image}}
 
     steps:
+    - name: Clear Working Directory
+      if: contains(matrix.runner, 'linux_aarch64')
+      shell: bash
+      run: rm -rf ./*
+
     - name: Configure Build Environment 1
       shell: bash
       run: |
@@ -267,3 +272,8 @@ jobs:
         AWS_ACCESS_KEY_ID: ${{ secrets.s3_access_key_id }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.s3_secret_access_key }}
       run: python3 $GITHUB_WORKSPACE/tools/ci-scripts/upload.py
+
+    - name: Clear Working Directory
+      if: contains(matrix.runner, 'linux_aarch64')
+      shell: bash
+      run: rm -rf ./*
diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml
index 13daa88831..b44a7d201c 100644
--- a/.github/workflows/pr_build.yml
+++ b/.github/workflows/pr_build.yml
@@ -156,9 +156,8 @@ jobs:
         fi
 
     - name: Clear Working Directory
-      if: startsWith(matrix.os, 'windows') || contains(matrix.os, 'self-hosted')
+      if: contains(matrix.runner, 'linux_aarch64')
       shell: bash
-      working-directory: ${{runner.workspace}}
       run: rm -rf ./*
 
     - uses: actions/checkout@v3
@@ -336,3 +335,8 @@ jobs:
         name: ${{ env.ARTIFACT_PATTERN }}
         path: ./build/${{ env.ARTIFACT_PATTERN }}
         if-no-files-found: error
+
+    - name: Clear Working Directory
+      if: contains(matrix.runner, 'linux_aarch64')
+      shell: bash
+      run: rm -rf ./*