Merge pull request #45 from Rust-for-Linux/dev/sync-fix

Dev/sync fix

Author: BennoLossin

.github/workflows/ci.yml

@@ -167,3 +167,31 @@ jobs:
           ref: ${{github.event.pull_request.head.sha}}
       - run: git config user.name "github-runner" && git config user.email "<>"
       - run: git rebase --exec 'git log -1 --pretty=format:%B | grep -q "^Signed-off-by:"' --root
+  apply:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          repository: Rust-for-Linux/linux
+          path: "kernel"
+          ref: pin-init-next
+      - uses: actions/checkout@v4
+        with:
+          path: "pin-init"
+          fetch-depth: 0
+          ref: ${{github.event.pull_request.head.sha}}
+      - run: |
+          pushd kernel
+          git config user.name "github-runner" && git config user.email "<>"
+          popd # kernel
+
+          pushd pin-init
+          git config user.name "github-runner" && git config user.email "<>"
+          git fetch
+          if ! yes | bash ./to-kernel.sh ../kernel origin/next; then
+              if ! git am --3way; then
+                  git am --show-current-patch=diff
+                  false
+              fi
+              false
+          fi

to-kernel.sh

@@ -60,7 +60,8 @@ head=$(git rev-parse HEAD)
 git am                                              \
     --signoff                                       \
     --directory="rust/pin-init"                     \
-    --exclude="rust/pin-init/sync-kernel.sh"        \
+    --exclude="rust/pin-init/to-kernel.sh"          \
+    --exclude="rust/pin-init/from-kernel.sh"        \
     --exclude="rust/pin-init/LICENSE-APACHE"        \
     --exclude="rust/pin-init/LICENSE-MIT"           \
     --exclude="rust/pin-init/CHANGELOG.md"          \