fix check build

5ec1cff · Feb 4, 2025 · bf8e396 · bf8e396
1 parent 10ec4e9
commit bf8e396
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/.github/workflows/build-manager.yml b/.github/workflows/build-manager.yml
@@ -50,13 +50,15 @@ jobs:
             git config --global user.email '[email protected]'
             git init .
             git remote add origin https://github.com/${{ github.repository }}
-            CURRENT_COMMIT="${{ github.events.head_commit.id }}"
+            CURRENT_COMMIT="${{ github.event.head_commit.id }}"
             git fetch origin $CURRENT_COMMIT --depth=1
             git fetch origin lkm --depth=1
-            LKM_COMMIT="$(git log --format=%B -n 1 origin/lkm | head -n 1 | tr -d '[:space:]')"
+            LKM_COMMIT="$(git log --format=%B -n 1 origin/lkm | head -n 1)"
             LKM_COMMIT="${LKM_COMMIT#Upload LKM from }"
+            LKM_COMMIT=$(echo "$LKM_COMMIT" | tr -d '[:space:]')
             echo "LKM_COMMIT=$LKM_COMMIT"
-            git diff --quiet "$LKM_COMMIT" "$CURRENT_COMMIT" -- kernel .github/workflows/build-lkm.yml .github/workflows/build-kernel-*.yml && kernel_changed=false
+            git fetch origin "$LKM_COMMIT" --depth=1
+            git diff --quiet "$LKM_COMMIT" "$CURRENT_COMMIT" -- kernel :!kernel/setup.sh .github/workflows/build-lkm.yml .github/workflows/build-kernel-*.yml && kernel_changed=false
             cd ..
             rm -rf tmp
           fi
@@ -95,7 +97,7 @@ jobs:
       target: ${{ matrix.target }}
       os: ${{ matrix.os }}
       pack_lkm: true
-      pull_lkm: ${{ !needs.check-build-lkm.outputs.build_lkm }}
+      pull_lkm: ${{ needs.check-build-lkm.outputs.build_lkm != 'true' }}
 
   build-manager:
     needs: build-ksud