Skip to content

Commit 8ef1b00

Browse files
committed
Merge remote-tracking branch 'origin/opamp-client-api' into opamp-client-api
# Conflicts: # .github/workflows/build.yml
2 parents 0e2cb81 + d0a61c4 commit 8ef1b00

File tree

1 file changed

+31
-24
lines changed

1 file changed

+31
-24
lines changed

.github/workflows/build.yml

Lines changed: 31 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ on:
88
pull_request:
99
workflow_dispatch:
1010

11-
permissions:
12-
contents: read
13-
1411
concurrency:
1512
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
1613
cancel-in-progress: true
@@ -19,20 +16,24 @@ jobs:
1916
build:
2017
runs-on: ubuntu-latest
2118
steps:
22-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
19+
- uses: actions/checkout@v4
20+
with:
21+
submodules: true
2322

2423
- name: Set up JDK for running Gradle
25-
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
24+
uses: actions/setup-java@v4
2625
with:
2726
distribution: temurin
2827
java-version: 17
2928

3029
- name: Set up gradle
31-
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
30+
uses: gradle/actions/setup-gradle@v4
3231
with:
3332
cache-read-only: ${{ github.event_name == 'pull_request' }}
3433
- name: Gradle build and test
3534
run: ./gradlew build -x test
35+
env:
36+
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
3637

3738
test:
3839
name: test (${{ matrix.test-java-version }})
@@ -43,28 +44,29 @@ jobs:
4344
- 8
4445
- 11
4546
- 17
46-
- 21
47-
- 23
47+
- 20
4848
fail-fast: false
4949
steps:
50-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
50+
- uses: actions/checkout@v4
51+
with:
52+
submodules: true
5153

5254
- id: setup-test-java
5355
name: Set up JDK ${{ matrix.test-java-version }} for running tests
54-
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
56+
uses: actions/setup-java@v4
5557
with:
5658
# using zulu because new releases get published quickly
5759
distribution: zulu
5860
java-version: ${{ matrix.test-java-version }}
5961

6062
- name: Set up JDK for running Gradle
61-
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
63+
uses: actions/setup-java@v4
6264
with:
6365
distribution: temurin
6466
java-version: 17
6567

6668
- name: Set up gradle
67-
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
69+
uses: gradle/actions/setup-gradle@v4
6870
with:
6971
cache-read-only: ${{ github.event_name == 'pull_request' }}
7072
- name: Gradle test
@@ -73,28 +75,33 @@ jobs:
7375
-PtestJavaVersion=${{ matrix.test-java-version }}
7476
-Porg.gradle.java.installations.paths=${{ steps.setup-test-java.outputs.path }}
7577
-Porg.gradle.java.installations.auto-download=false
78+
env:
79+
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
7680

7781
integration-test:
7882
runs-on: ubuntu-latest
7983
steps:
80-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
84+
- uses: actions/checkout@v4
85+
with:
86+
submodules: true
8187

8288
- name: Set up JDK for running Gradle
83-
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
89+
uses: actions/setup-java@v4
8490
with:
8591
distribution: temurin
8692
java-version: 17
8793

8894
- name: Set up gradle
89-
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
95+
uses: gradle/actions/setup-gradle@v4
9096
with:
9197
cache-read-only: ${{ github.event_name == 'pull_request' }}
92-
9398
- name: Integration test
9499
run: ./gradlew integrationTest
100+
env:
101+
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
95102

96103
- name: Save integration test results
97-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
104+
uses: actions/upload-artifact@v4
98105
if: always()
99106
with:
100107
name: integration-test-results
@@ -129,16 +136,18 @@ jobs:
129136
- integration-test
130137
runs-on: ubuntu-latest
131138
steps:
132-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
139+
- uses: actions/checkout@v4
140+
with:
141+
submodules: true
133142

134143
- name: Set up JDK for running Gradle
135-
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
144+
uses: actions/setup-java@v4
136145
with:
137146
distribution: temurin
138147
java-version: 17
139148

140149
- name: Set up gradle
141-
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
150+
uses: gradle/actions/setup-gradle@v4
142151
# skipping release branches because the versions in those branches are not snapshots
143152
# (also this skips pull requests)
144153
if: ${{ github.ref_name == 'main' && github.repository == 'open-telemetry/opentelemetry-java-contrib' }}
@@ -152,21 +161,19 @@ jobs:
152161
GPG_PASSWORD: ${{ secrets.GPG_PASSWORD }}
153162

154163
required-status-check:
155-
if: github.event_name == 'pull_request' && always()
164+
if: github.event_name == 'pull_request'
156165
needs:
157166
- build
158-
- test
159167
- integration-test
160168
- markdown-lint-check
161169
- misspell-check
162170
- shell-script-check
163171
runs-on: ubuntu-latest
164172
steps:
165-
# only the build and test checks are required for release branch PRs in order
173+
# only the "build" and "integration-test" checks are required for release branch PRs in order
166174
# to avoid any unnecessary release branch maintenance (especially for patches)
167175
- if: |
168176
needs.build.result != 'success' ||
169-
needs.test.result != 'success' ||
170177
needs.integration-test.result != 'success' ||
171178
(
172179
!startsWith(github.base_ref, 'release/') &&

0 commit comments

Comments
 (0)