Skip to content

Commit ffd74a0

Browse files
zeitlingerzeitlinger
authored
Merge branch 'main' into feature/env-var-properties
2 parents 6db2ed1 + cdf4dcf commit ffd74a0

File tree

52 files changed

+2617
-1046
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+2617
-1046
lines changed

‎.github/workflows/acceptance-tests.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ 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:
18-
version: v2026.1.7
19-
sha256: d98523f15392ab17909a55560244667aa81122766209b816d9a9b9585109bfea
18+
version: v2026.2.0
19+
sha256: 7e1cd2dc33f6ebc9f33c1911013ed92bf724cf63ece21f284aaa4b34987e5002
2020
- name: Run acceptance tests
2121
run: mise run acceptance-test

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ 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
1616
with:
17-
version: v2026.1.7
18-
sha256: d98523f15392ab17909a55560244667aa81122766209b816d9a9b9585109bfea
17+
version: v2026.2.0
18+
sha256: 7e1cd2dc33f6ebc9f33c1911013ed92bf724cf63ece21f284aaa4b34987e5002
1919
- name: Cache local Maven repository
20-
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
20+
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
2121
with:
2222
path: ~/.m2/repository
2323
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

‎.github/workflows/github-pages.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ 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"
3939
fetch-depth: 0
4040
- uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1
4141
with:
42-
version: v2026.1.7
43-
sha256: d98523f15392ab17909a55560244667aa81122766209b816d9a9b9585109bfea
42+
version: v2026.2.0
43+
sha256: 7e1cd2dc33f6ebc9f33c1911013ed92bf724cf63ece21f284aaa4b34987e5002
4444
cache: "false"
4545
- name: Setup Pages
4646
id: pages

‎.github/workflows/java-version-matrix-tests.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ jobs:
3434
- name: Set up mise
3535
uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1
3636
with:
37-
version: v2026.1.4
38-
sha256: 79c798e39b83f0dd80108eaa88c6ca63689695ae975fd6786e7a353ef9f87002
37+
version: v2026.2.0
38+
sha256: 7e1cd2dc33f6ebc9f33c1911013ed92bf724cf63ece21f284aaa4b34987e5002
3939

4040
- name: Cache local Maven repository
41-
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
41+
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
4242
with:
4343
path: ~/.m2/repository
4444
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

‎.github/workflows/lint-rest.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ jobs:
2121
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2222
- uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1
2323
with:
24-
version: v2026.1.7
25-
sha256: d98523f15392ab17909a55560244667aa81122766209b816d9a9b9585109bfea
24+
version: v2026.2.0
25+
sha256: 7e1cd2dc33f6ebc9f33c1911013ed92bf724cf63ece21f284aaa4b34987e5002
2626

2727
- name: Lint for pull requests
2828
if: github.event_name == 'pull_request'

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

Lines changed: 2 additions & 2 deletions
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

@@ -27,7 +27,7 @@ jobs:
2727
java-version: ${{ matrix.java }}
2828

2929
- name: Cache local Maven repository
30-
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
30+
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
3131
with:
3232
path: ~/.m2/repository
3333
key: ${{ runner.os }}-maven-java${{ matrix.java }}-${{ hashFiles('**/pom.xml') }}

‎.github/workflows/native-tests.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ 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:
18-
version: v2026.1.7
19-
sha256: d98523f15392ab17909a55560244667aa81122766209b816d9a9b9585109bfea
18+
version: v2026.2.0
19+
sha256: 7e1cd2dc33f6ebc9f33c1911013ed92bf724cf63ece21f284aaa4b34987e5002
2020
working_directory: .mise/envs/native
2121
- name: Run native tests
2222
working-directory: .mise/envs/native

‎.github/workflows/nightly-benchmarks.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ jobs:
3636
- name: Setup mise
3737
uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1
3838
with:
39-
version: v2026.1.4
40-
sha256: 79c798e39b83f0dd80108eaa88c6ca63689695ae975fd6786e7a353ef9f87002
39+
version: v2026.2.0
40+
sha256: 7e1cd2dc33f6ebc9f33c1911013ed92bf724cf63ece21f284aaa4b34987e5002
4141

4242
- name: Cache local Maven repository
43-
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
43+
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
4444
with:
4545
path: ~/.m2/repository
4646
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ 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

2727
- uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1
2828
with:
29-
version: v2026.1.7
30-
sha256: d98523f15392ab17909a55560244667aa81122766209b816d9a9b9585109bfea
29+
version: v2026.2.0
30+
sha256: 7e1cd2dc33f6ebc9f33c1911013ed92bf724cf63ece21f284aaa4b34987e5002
3131
cache: false
3232

3333
- name: Build release version

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,26 @@ 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
19+
fetch-tags: "true"
20+
fetch-depth: 0
1921
- uses: jdx/mise-action@6d1e696aa24c1aa1bcc1adea0212707c71ab78a8 # v3.6.1
2022
with:
21-
version: v2026.1.7
22-
sha256: d98523f15392ab17909a55560244667aa81122766209b816d9a9b9585109bfea
23+
version: v2026.2.0
24+
sha256: 7e1cd2dc33f6ebc9f33c1911013ed92bf724cf63ece21f284aaa4b34987e5002
2325
- name: Cache local Maven repository
24-
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
26+
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
2527
with:
2628
path: ~/.m2/repository
2729
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
2830
restore-keys: |
2931
${{ runner.os }}-maven-
30-
- name: Build Javadoc
31-
run: mise run javadoc
32+
- name: Build GitHub Pages
33+
run: mise run build-gh-pages
34+
env:
35+
BASE_URL: "/client_java"
3236
- name: Build release version
3337
run: mise run build-release
3438
env:

0 commit comments

Comments
 (0)