Skip to content

Commit e47941f

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

File tree

14 files changed

+927
-921
lines changed

14 files changed

+927
-921
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ jobs:
1111
runs-on: ubuntu-24.04
1212
steps:
1313
- uses: actions/checkout@v4
14-
- name: Setup ASDF
15-
uses: equisoft-actions/with-asdf-vm@v2
14+
- uses: jdx/mise-action@v2
1615
- name: Cache local Maven repository
1716
uses: actions/cache@v4
1817
with:
@@ -25,6 +24,7 @@ jobs:
2524
PROTO_GENERATION: true
2625
REQUIRE_PROTO_UP_TO_DATE: true
2726
run: |
27+
mise run ci
2828
mvn -v
2929
./mvnw clean install
3030
./mvnw javadoc:javadoc -P javadoc # just to check if javadoc is generated

.tool-versions

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

CONTRIBUTING.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ If you're getting errors when running tests:
3030
- Use `-Dcheckstyle.skip=true` to skip the checkstyle check during development.
3131
- Use `-Dwarnings=-nowarn` to skip the warnings during development.
3232

33+
Combine all with `mvn test -DskipTests=true -Dspotless.check.skip=true -Dcoverage.skip=true -Dcheckstyle.skip=true -Dwarnings=-nowarn`.
34+
3335
## Updating the Protobuf Java Classes
3436

3537
Use `PROTO_GENERATION=true mvn clean install` to generate protobuf classes.

integration-tests/it-common/src/test/java/io/prometheus/client/it/common/ExporterTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import static org.assertj.core.api.Assertions.assertThat;
55
import static org.assertj.core.api.Assertions.fail;
66

7-
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_0.Metrics;
7+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_1.Metrics;
88
import java.io.ByteArrayInputStream;
99
import java.io.IOException;
1010
import java.io.InputStream;

integration-tests/it-exporter/it-exporter-test/src/test/java/io/prometheus/metrics/it/exporter/test/ExporterIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import com.google.common.io.Resources;
77
import io.prometheus.client.it.common.ExporterTest;
8-
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_0.Metrics;
8+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_1.Metrics;
99
import java.io.IOException;
1010
import java.net.URISyntaxException;
1111
import java.net.URLEncoder;

integration-tests/it-spring-boot-smoke-test/src/test/java/io/prometheus/metrics/it/springboot/ApplicationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import static org.assertj.core.api.Assertions.assertThat;
44

55
import io.prometheus.client.it.common.ExporterTest;
6-
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_0.Metrics;
6+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_1.Metrics;
77
import java.io.IOException;
88
import java.net.URL;
99
import java.util.List;

mise.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[env]
2+
PROTO_GENERATION = "true"
3+
4+
[tools]
5+
java = "temurin-17.0.13+11"
6+
protoc = "latest"

prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/CounterTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import static org.assertj.core.data.Offset.offset;
77

88
import io.prometheus.metrics.core.exemplars.ExemplarSamplerConfigTestUtil;
9-
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_0.Metrics;
9+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_1.Metrics;
1010
import io.prometheus.metrics.expositionformats.internal.PrometheusProtobufWriterImpl;
1111
import io.prometheus.metrics.expositionformats.internal.ProtobufUtil;
1212
import io.prometheus.metrics.model.snapshots.CounterSnapshot;

prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/HistogramTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import io.prometheus.metrics.core.datapoints.DistributionDataPoint;
99
import io.prometheus.metrics.core.exemplars.ExemplarSamplerConfigTestUtil;
1010
import io.prometheus.metrics.expositionformats.OpenMetricsTextFormatWriter;
11-
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_0.Metrics;
11+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_1.Metrics;
1212
import io.prometheus.metrics.expositionformats.internal.PrometheusProtobufWriterImpl;
1313
import io.prometheus.metrics.expositionformats.internal.ProtobufUtil;
1414
import io.prometheus.metrics.model.snapshots.ClassicHistogramBucket;

prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/InfoTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
55

66
import io.prometheus.metrics.expositionformats.OpenMetricsTextFormatWriter;
7-
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_0.Metrics;
7+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_30_1.Metrics;
88
import io.prometheus.metrics.expositionformats.internal.PrometheusProtobufWriterImpl;
99
import io.prometheus.metrics.expositionformats.internal.ProtobufUtil;
1010
import io.prometheus.metrics.model.snapshots.Labels;

0 commit comments

Comments
 (0)