Skip to content

Commit 7525490

Browse files
committed
fix check build
1 parent 10ec4e9 commit 7525490

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

.github/workflows/build-manager.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,15 @@ jobs:
5050
git config --global user.email 'bot@github.5ec1cff.io'
5151
git init .
5252
git remote add origin https://github.com/${{ github.repository }}
53-
CURRENT_COMMIT="${{ github.events.head_commit.id }}"
53+
CURRENT_COMMIT="${{ github.event.head_commit.id }}"
5454
git fetch origin $CURRENT_COMMIT --depth=1
5555
git fetch origin lkm --depth=1
56-
LKM_COMMIT="$(git log --format=%B -n 1 origin/lkm | head -n 1 | tr -d '[:space:]')"
56+
LKM_COMMIT="$(git log --format=%B -n 1 origin/lkm | head -n 1)"
5757
LKM_COMMIT="${LKM_COMMIT#Upload LKM from }"
58+
LKM_COMMIT=$(echo "$LKM_COMMIT" | tr -d '[:space:]')
5859
echo "LKM_COMMIT=$LKM_COMMIT"
59-
git diff --quiet "$LKM_COMMIT" "$CURRENT_COMMIT" -- kernel .github/workflows/build-lkm.yml .github/workflows/build-kernel-*.yml && kernel_changed=false
60+
git fetch origin "$LKM_COMMIT" --depth=1
61+
git diff --quiet "$LKM_COMMIT" "$CURRENT_COMMIT" -- kernel :!kernel/setup.sh .github/workflows/build-lkm.yml .github/workflows/build-kernel-*.yml && kernel_changed=false
6062
cd ..
6163
rm -rf tmp
6264
fi
@@ -95,9 +97,10 @@ jobs:
9597
target: ${{ matrix.target }}
9698
os: ${{ matrix.os }}
9799
pack_lkm: true
98-
pull_lkm: ${{ !needs.check-build-lkm.outputs.build_lkm }}
100+
pull_lkm: ${{ needs.check-build-lkm.outputs.build_lkm != 'true' }}
99101

100102
build-manager:
103+
if: ${{ always() }}
101104
needs: build-ksud
102105
runs-on: ubuntu-latest
103106
defaults:

0 commit comments

Comments
 (0)