From b1e2d22d03884eac748a2b742cd9312c02bd582b Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Thu, 30 Sep 2021 14:13:10 +0200 Subject: [PATCH] .github: clean up an unnecessary patch file After applying a patch file, we should clean up the unnecessary patch file, to avoid conflicts when applying multiple patches in one PR. --- .../src/third_party/coreos-overlay/.github/workflows/common.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk_container/src/third_party/coreos-overlay/.github/workflows/common.sh b/sdk_container/src/third_party/coreos-overlay/.github/workflows/common.sh index ed78c2bd1e..374ff0f919 100644 --- a/sdk_container/src/third_party/coreos-overlay/.github/workflows/common.sh +++ b/sdk_container/src/third_party/coreos-overlay/.github/workflows/common.sh @@ -87,4 +87,5 @@ function apply_patches() { git fetch origin git checkout -B "${BASE_BRANCH}" "origin/${BASE_BRANCH}" git am "${SDK_OUTER_SRCDIR}"/third_party/coreos-overlay/0*.patch + rm -f "${SDK_OUTER_SRCDIR}"/third_party/coreos-overlay/0*.patch }