Skip to content

Commit 31aebc3

Browse files
authored
Merge branch 'main' into duplicate-names-registration-validation
Signed-off-by: Jay DeLuca <jaydeluca4@gmail.com>
2 parents b17cd0f + ba308cf commit 31aebc3

File tree

18 files changed

+922
-922
lines changed

18 files changed

+922
-922
lines changed

.github/workflows/acceptance-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: Check out
1313
with:
1414
persist-credentials: false
15-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
15+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
1616
- uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1
1717
with:
1818
version: v2026.2.0

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
build:
1010
runs-on: ubuntu-24.04
1111
steps:
12-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
12+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
1313
with:
1414
persist-credentials: false
1515
- uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1

.github/workflows/github-pages.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
if: github.repository == 'prometheus/client_java'
3333
runs-on: ubuntu-24.04
3434
steps:
35-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
35+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
3636
with:
3737
persist-credentials: false
3838
fetch-tags: "true"

.github/workflows/multi-version-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
java: [17, 21, 25]
1616
steps:
1717
- name: Check out
18-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
18+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
1919
with:
2020
persist-credentials: false
2121

.github/workflows/native-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: Check out
1313
with:
1414
persist-credentials: false
15-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
15+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
1616
- uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1
1717
with:
1818
version: v2026.2.0

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
echo "${#GPG_SIGNING_KEY}"
2121
echo "${GPG_SIGNING_KEY}" | gpg --batch --import-options import-show --import
2222
- name: Checkout Plugin Repository
23-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
23+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
2424
with:
2525
persist-credentials: false
2626

.github/workflows/test-release-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
build:
1414
runs-on: ubuntu-24.04
1515
steps:
16-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
16+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
1717
with:
1818
persist-credentials: false
1919
- uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1

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_33_4.Metrics;
7+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_5.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_33_4.Metrics;
8+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_5.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_33_4.Metrics;
6+
import io.prometheus.metrics.expositionformats.generated.com_google_protobuf_4_33_5.Metrics;
77
import java.io.IOException;
88
import java.net.URI;
99
import java.util.List;

0 commit comments

Comments
 (0)