Skip to content

Commit 6418360

Browse files
committed
use mise
Signed-off-by: Gregor Zeitlinger <[email protected]>
1 parent 2d9dff2 commit 6418360

File tree

4 files changed

+14
-12
lines changed

4 files changed

+14
-12
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
*.iml
1010

1111
target/
12+
build/
1213
simpleclient_pushgateway/mockserver.log
1314
simpleclient_pushgateway/mockserver_request.log
1415
nb-configuration.xml

mise.toml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ protoc = "latest"
99
[tasks.ci]
1010
description = "CI Build"
1111
run = [
12-
"./mvnw clean install",
13-
# just to check if javadoc can be generated
14-
"./mvnw javadoc:javadoc -P javadoc"
12+
"./mvnw clean install",
13+
# just to check if javadoc can be generated
14+
"./mvnw javadoc:javadoc -P javadoc"
1515
]
1616
env = { REQUIRE_PROTO_UP_TO_DATE = "true" }
1717

@@ -27,13 +27,20 @@ run = "./mvnw test -DskipTests=true -Dspotless.check.skip=true -Dcoverage.skip=t
2727
description = "run all tests"
2828
run = "./mvnw verify"
2929

30+
[tasks.build]
31+
description = "build all modules wihthout tests"
32+
run = "./mvnw clean install -DskipTests"
33+
3034
[tasks.acceptance-test]
3135
description = "Run OATs acceptance tests"
36+
depends = "build"
3237
run = "oats -timeout 5m examples/"
3338

3439
[tasks.native-test]
35-
tools.java = "graalvm-21.3.3+java17"
36-
run = "./scripts/run-native-tests.sh"
40+
depends = "build"
41+
tools.java = "graalvm-22.3.3+java17"
42+
run = "../../mvnw test -PnativeTest"
43+
dir = "integration-tests/it-spring-boot-smoke-test"
3744

3845
[settings]
3946
# to get lock file support and for go backend

prometheus-metrics-exposition-formats/generate-protobuf.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ if [[ $GENERATED_WITH != "$PROTOBUF_VERSION" ]]; then
4141
exit 1
4242
fi
4343

44+
git checkout -- mise.lock # see https://github.com/jdx/mise/discussions/4782
4445
STATUS=$(git status --porcelain)
4546
if [[ ${REQUIRE_PROTO_UP_TO_DATE:-false} == "true" && -n "$STATUS" ]]; then
4647
echo "Please use https://mise.jdx.dev/ - this will use the version specified in mise.toml"

scripts/run-native-tests.sh

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)