From dde7a7b809c87faf614c704636d3b0d2b9059632 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Thu, 17 Mar 2022 13:40:02 +0100 Subject: [PATCH] Revert "Remove git submodules before git checkout (#1611)" (#1799) This reverts commit ff07728fa3bb6b06e2c05a8134213a5830244259. Removing the .git file from the git submodule is problematic when updating buildroot: Files deleted stay present in the buildroot directory (since their origin is no longer known). The workaround has been introduced to allow building non-git submodule releases (rel-6) on the same runners. Since rel-7 uses git submodule and we stay with git submodule for the forseeable future, remove this work around. --- .github/workflows/dev.yml | 4 ---- .github/workflows/release.yml | 4 ---- 2 files changed, 8 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 157302b0a..25aac2d7a 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -77,10 +77,6 @@ jobs: return { "ref": context.ref } return { "ref": context.payload.pull_request.head.sha } - # Make sure directories of potentially removed submodules are cleaned correctly - - name: Cleanup git submodules - run: find . -name .git -type f -exec rm {} \; - - name: Checkout source uses: actions/checkout@v2 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5860c5925..ee5300d50 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -57,10 +57,6 @@ jobs: runs-on: ${{ matrix.board.runner }} steps: - # Make sure directories of potentially removed submodules are cleaned correctly - - name: Cleanup git submodules - run: find . -name .git -type f -exec rm {} \; - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v2 with: