Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

关于若干issue的修复 #989

Closed
wants to merge 62 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
3141a30
chore(deps): use dough from jitpack
ybw0014 Oct 19, 2023
7affe4c
chore: Merge branch 'dev'
StarWishsama Oct 20, 2023
54c1294
chore: Merge branch 'dev'
StarWishsama Oct 20, 2023
ffd3ced
chore: fixed git hook
StarWishsama Dec 4, 2023
d813882
fix: missing tab completer
StarWishsama Oct 21, 2023
40b4cac
chore: cleanup
StarWishsama Oct 21, 2023
c01a969
fix(android): ensure android status before execute instruction
StarWishsama Oct 26, 2023
e35c108
chore(deps): introduced lombok
StarWishsama Oct 26, 2023
84fdef6
fix(deps): missing annotation processor
StarWishsama Oct 26, 2023
f29813d
fix(research): convert rate not being updated
StarWishsama Oct 28, 2023
2727655
chore: fix pre-commit hook
StarWishsama Oct 28, 2023
296ac2b
chore: spotless stuff
StarWishsama Oct 28, 2023
6eeae92
🔧 Bump me.clip:placeholderapi from 2.11.3 to 2.11.4 (#35)
dependabot[bot] Oct 29, 2023
8cf003d
🔧 Bump com.rudikershaw.gitbuildhook:git-build-hook-maven-plugin (#37)
dependabot[bot] Oct 29, 2023
1a2c98b
🔧 Bump com.gmail.nossr50.mcMMO:mcMMO from 2.1.223 to 2.1.225 (#38)
dependabot[bot] Oct 29, 2023
c1cc2ca
🔧 Bump com.sk89q.worldedit:worldedit-core from 7.2.15 to 7.2.17 (#36)
dependabot[bot] Oct 29, 2023
292d0a5
fix(tool): closes #809
StarWishsama Oct 30, 2023
c326314
chore: fixing pre-commit
StarWishsama Oct 30, 2023
651c832
fix(tool): duplicated code
StarWishsama Oct 30, 2023
42bc3f8
🔧 Bump com.zaxxer:HikariCP from 5.0.1 to 5.1.0 (#40)
dependabot[bot] Nov 7, 2023
8f7b5e2
🔧 Bump me.clip:placeholderapi from 2.11.4 to 2.11.5 (#39)
dependabot[bot] Nov 7, 2023
8aa175f
chore(deps): bump dependencies
ybw0014 Nov 22, 2023
39fe312
Merge upstream (#44)
ybw0014 Nov 23, 2023
2c3c5fe
feat: e2e test (#45)
ybw0014 Nov 24, 2023
bd791bf
chore: 最小化部分数据库报错
StarWishsama Nov 24, 2023
c1ad75f
🔧 Bump net.guizhanss:GuizhanLib-common from 1.5.0 to 1.6.1 (#47)
dependabot[bot] Nov 29, 2023
6a5ae60
🔧 Bump net.guizhanss:GuizhanLib-updater from 1.5.0 to 1.6.1 (#48)
dependabot[bot] Nov 29, 2023
4f137a9
chore: backpack 默认 op 权限
StarWishsama Nov 29, 2023
61f4cc4
chore(deps): use dough from jitpack
ybw0014 Oct 19, 2023
50f52a2
fix: version
dependabot[bot] Nov 29, 2023
2945e6a
ci: fix jitpack
ybw0014 Dec 29, 2023
c35b36f
Merge branch 'dev'
StarWishsama Jan 1, 2024
eabaa21
Merge remote-tracking branch 'origin/master'
StarWishsama Jan 1, 2024
40c4284
Merge branch 'dev'
StarWishsama Feb 4, 2024
5f642d0
chore(deps): bump org.postgresql:postgresql from 42.6.0 to 42.7.2
dependabot[bot] Feb 21, 2024
1e05b50
Merge pull request #845 from StarWishsama/dependabot/maven/org.postgr…
StarWishsama Feb 21, 2024
35a49db
Merge branch 'dev'
StarWishsama Apr 2, 2024
ea9e628
Merge branch 'refs/heads/dev'
StarWishsama May 18, 2024
faea471
chore: 尝试让构建站重新构建
ybw0014 May 19, 2024
f9f4bb9
chore: 尝试让构建站再次重新构建
ybw0014 May 19, 2024
ea2c1d2
chore(renovate): 配置 renovate
ybw0014 May 26, 2024
226af9b
Merge branch 'refs/heads/dev'
StarWishsama Jun 9, 2024
7f9f9b2
fix(radiation): 让玩家在进入是获得辐射免疫 (#907)
JWJUN233233 Jul 4, 2024
47ebbd4
Revert "fix(radiation): 让玩家在进入是获得辐射免疫 (#907)"
StarWishsama Jul 4, 2024
af4cb3b
Merge pull request #917 from SlimefunGuguProject/revert-907-fix/radia…
StarWishsama Jul 4, 2024
ebd90ae
Merge branch 'refs/heads/dev'
StarWishsama Jul 13, 2024
3525534
Merge branch 'refs/heads/dev'
StarWishsama Jul 16, 2024
be9a3e5
Merge branch 'refs/heads/dev'
StarWishsama Jul 17, 2024
d36ce9d
Merge branch 'refs/heads/dev'
StarWishsama Jul 17, 2024
5d89728
Merge branch 'refs/heads/dev'
StarWishsama Aug 4, 2024
538e41a
Merge branch 'refs/heads/dev'
ybw0014 Aug 6, 2024
dc72b4b
Merge branch 'refs/heads/dev'
StarWishsama Aug 29, 2024
9fdeb08
Merge branch 'refs/heads/dev'
StarWishsama Sep 12, 2024
7bb1ab3
Merge branch 'refs/heads/dev'
StarWishsama Sep 15, 2024
0021742
Merge branch 'refs/heads/dev'
StarWishsama Sep 17, 2024
b974f06
Merge branch 'refs/heads/dev'
StarWishsama Oct 14, 2024
9ddebfa
1.21.x
haiman233 Nov 9, 2024
6664da3
Merge pull request #968 from haiman233/master
StarWishsama Nov 10, 2024
5cf0268
commit fix
m1919810 Dec 29, 2024
3b663d6
revert #988
m1919810 Dec 29, 2024
e576df5
Merge remote-tracking branch 'source/dev' into commit
m1919810 Dec 29, 2024
b6fa02a
formating
m1919810 Dec 29, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: fix pre-commit hook
  • Loading branch information
StarWishsama committed Dec 4, 2023
commit 272765558d3bec69493d98245a1d3dd57ee67113
38 changes: 15 additions & 23 deletions .git-hooks/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -14,36 +14,28 @@ if ! [ -x "$(command -v mvn)" ]; then
exit 1
fi

spotless() {
if [ ! -e "mvn" ]; then
if [ ! -e "mvn" ]; then
return 0
fi

CHANGED_FILES="$(git --no-pager diff --name-status --no-color --cached | awk '$1 != "D" && $NF ~ /\.xml?$/ { print $NF }')"

if [ -z "$CHANGED_FILES" ]; then
echo "No staged files."
return 0
fi
fi

echo '[pre-commit] Executing Maven spotlessCheck before commit'
CHANGED_FILES="$(git --no-pager diff --name-status --no-color --cached | awk '$1 != "D" && $NF ~ /\.xml?$/ { print $NF }')"

git stash --quiet --keep-index
if [ -z "$CHANGED_FILES" ]; then
echo "No staged files."
return 0
fi

mvn -B spotless:check
echo '[pre-commit] Executing Maven spotlessCheck before commit'

RESULT=$?
git stash --quiet --keep-index

git stash pop -q
mvn spotless:check -DspotlessFiles=$CHANGED_FILES

if [ "$RESULT" -ne "0" ]; then
echo -e "spotlessCheck failed..."
echo -e 'You can try "./mvn spotless:apply" to apply auto-fixes.'
fi
RESULT=$?

return $RESULT
}
git stash pop -q

if ! spotless; then
exit 1
if [ "$RESULT" -ne "0" ]; then
echo -e "spotlessCheck failed..."
echo -e 'You can try "./mvn spotless:apply" to apply auto-fixes.'
fi