فهرست منبع

pkg/debian: Speed up cloning of kernel tree

Cloning the full branch takes quite a long time on the Ubuntu mainline
repo. The idea was that this would enable us to use `git am -3`, i.e.
3way merges, but that quite often didn't work in practice anyways. So go
back to a shallow clone.
Maximilian Luz 3 سال پیش
والد
کامیت
6c21326de8
1فایلهای تغییر یافته به همراه3 افزوده شده و 3 حذف شده
  1. 3 3
      .github/workflows/debian.yml

+ 3 - 3
.github/workflows/debian.yml

@@ -43,13 +43,13 @@ jobs:
 
         # get ubuntu mainline source
         # see https://kernel.ubuntu.com/~kernel-ppa/mainline
-        git clone "$MAINLINE_REPO" --branch "$MAINLINE_BRANCH/v$KERNEL_VERSION" --single-branch linux
+        git clone "$MAINLINE_REPO" --branch "$MAINLINE_BRANCH/v$KERNEL_VERSION" --depth 1 linux
 
         cd linux
 
         # apply surface build/packaging patches
         for PATCH in ../*.patch; do
-          git am -3 ${PATCH}
+          git apply --index --reject ${PATCH}
         done
 
         git add .
@@ -57,7 +57,7 @@ jobs:
 
         # apply surface patches
         for PATCH in ../../../../patches/${KERNEL_VERSION%.*}/*.patch; do
-          git am -3 ${PATCH}
+          git apply --index --reject ${PATCH}
         done
 
         git add .