From 842c0b674feaa4f6522452c8dc2ad2837f99892c Mon Sep 17 00:00:00 2001 From: weishu Date: Thu, 4 May 2023 15:37:06 +0800 Subject: [PATCH] ci: Fix setlocalversion patch failed (#451) --- ...-don-t-check-for-uncommitted-changes.patch | 43 ----------------- ...t-check-for-uncommitted-changes-5.15.patch | 46 ------------------- .github/workflows/gki-kernel.yml | 2 + 3 files changed, 2 insertions(+), 89 deletions(-) delete mode 100644 .github/patches/5.10/0001-setlocalversion-don-t-check-for-uncommitted-changes.patch delete mode 100644 .github/patches/5.15/0001-setlocalversion-don-t-check-for-uncommitted-changes-5.15.patch diff --git a/.github/patches/5.10/0001-setlocalversion-don-t-check-for-uncommitted-changes.patch b/.github/patches/5.10/0001-setlocalversion-don-t-check-for-uncommitted-changes.patch deleted file mode 100644 index b2dfff94..00000000 --- a/.github/patches/5.10/0001-setlocalversion-don-t-check-for-uncommitted-changes.patch +++ /dev/null @@ -1,43 +0,0 @@ -From dbdd2906c0b3a967ca28c6b870b46f905c170661 Mon Sep 17 00:00:00 2001 -From: Park Ju Hyung -Date: Wed, 13 Mar 2019 13:36:37 +0900 -Subject: [PATCH] setlocalversion: don't check for uncommitted changes - -I ofter push after the build is done and I hate seeing "-dirty" - -Signed-off-by: Park Ju Hyung -Signed-off-by: Danny Lin -Signed-off-by: Divyanshu-Modi -Change-Id: I240c516520879da680794fd144b1f273f9e21e13 -Signed-off-by: Divyanshu-Modi ---- - scripts/setlocalversion | 13 ------------- - 1 file changed, 13 deletions(-) - -diff --git a/scripts/setlocalversion b/scripts/setlocalversion -index 842936656b84..ef27a273ebf5 100755 ---- a/scripts/setlocalversion -+++ b/scripts/setlocalversion -@@ -107,19 +107,6 @@ scm_version() - printf -- '-svn%s' "$(git svn find-rev $head)" - fi - -- # Check for uncommitted changes. -- # First, with git-status, but --no-optional-locks is only -- # supported in git >= 2.14, so fall back to git-diff-index if -- # it fails. Note that git-diff-index does not refresh the -- # index, so it may give misleading results. See -- # git-update-index(1), git-diff-index(1), and git-status(1). -- if { -- git --no-optional-locks status -uno --porcelain 2>/dev/null || -- git diff-index --name-only HEAD -- } | grep -qvE '^(.. )?scripts/package'; then -- printf '%s' -dirty -- fi -- - # All done with git - return - fi --- -2.37.2 - diff --git a/.github/patches/5.15/0001-setlocalversion-don-t-check-for-uncommitted-changes-5.15.patch b/.github/patches/5.15/0001-setlocalversion-don-t-check-for-uncommitted-changes-5.15.patch deleted file mode 100644 index 9c03a331..00000000 --- a/.github/patches/5.15/0001-setlocalversion-don-t-check-for-uncommitted-changes-5.15.patch +++ /dev/null @@ -1,46 +0,0 @@ -From bbb9e7fb1ccadac47b58ba615e6874ddeaa9e628 Mon Sep 17 00:00:00 2001 -From: Park Ju Hyung -Date: Wed, 13 Mar 2019 13:36:37 +0900 -Subject: [PATCH] setlocalversion: don't check for uncommitted changes - -I ofter push after the build is done and I hate seeing "-dirty" - -Signed-off-by: Park Ju Hyung -Signed-off-by: Danny Lin -Signed-off-by: Divyanshu-Modi -Change-Id: I240c516520879da680794fd144b1f273f9e21e13 -Signed-off-by: Divyanshu-Modi ---- - scripts/setlocalversion | 16 ---------------- - 1 file changed, 16 deletions(-) - -diff --git a/scripts/setlocalversion b/scripts/setlocalversion -index 1b733ae4c..2a3ea7684 100755 ---- a/scripts/setlocalversion -+++ b/scripts/setlocalversion -@@ -90,22 +90,6 @@ scm_version() - printf '%s%s' -g "$(echo $head | cut -c1-12)" - fi - -- # Check for uncommitted changes. -- # This script must avoid any write attempt to the source tree, -- # which might be read-only. -- # You cannot use 'git describe --dirty' because it tries to -- # create .git/index.lock . -- # First, with git-status, but --no-optional-locks is only -- # supported in git >= 2.14, so fall back to git-diff-index if -- # it fails. Note that git-diff-index does not refresh the -- # index, so it may give misleading results. See -- # git-update-index(1), git-diff-index(1), and git-status(1). -- if { -- git --no-optional-locks status -uno --porcelain 2>/dev/null || -- git diff-index --name-only HEAD -- } | read dummy; then -- printf '%s' -dirty -- fi - fi - } - --- -2.37.2 - diff --git a/.github/workflows/gki-kernel.yml b/.github/workflows/gki-kernel.yml index 23548de9..f7f6c28d 100644 --- a/.github/workflows/gki-kernel.yml +++ b/.github/workflows/gki-kernel.yml @@ -103,6 +103,8 @@ jobs: grep -q "kernelsu" $DRIVER_MAKEFILE || echo "obj-y += kernelsu/" >> $DRIVER_MAKEFILE echo "[+] Apply KernelSU patches" cd $GKI_ROOT/common/ && git apply $GITHUB_WORKSPACE/KernelSU/.github/patches/$PATCH_PATH/*.patch + echo "Patch script/setlocalversion" + sed -i 's/-dirty//g' $GKI_ROOT/common/scripts/setlocalversion echo "[+] KernelSU setup done." - name: Symbol magic