Skip to content

Commit 57c4bb5

Browse files
committed
ci: bring the dependencies check back
This change adds the dependencies check back to the ci.yaml, google-auth-library-java-ci.yaml, and sdk-platform-java-ci.yaml. This removes unnecessary java version matrix logic in existing dependencies check. Java 17 just works fine. Fixes #12895
1 parent ce4969b commit 57c4bb5

5 files changed

Lines changed: 44 additions & 15 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -253,9 +253,6 @@ jobs:
253253
matrix:
254254
package: ${{ fromJSON(needs.changes.outputs.packages) }}
255255
steps:
256-
- name: Get current week within the year
257-
id: date
258-
run: echo "::set-output name=week_of_year::$(date +'%W' --utc)"
259256
- uses: actions/checkout@v4
260257
- uses: actions/setup-java@v4
261258
with:
@@ -266,8 +263,23 @@ jobs:
266263
BUILD_SUBDIR: ${{matrix.package}}
267264
JOB_TYPE: clirr
268265
JOB_NAME: clirr-${{matrix.package}}
266+
split-dependencies:
267+
runs-on: ubuntu-latest
268+
needs: changes
269+
strategy:
270+
matrix:
271+
package: ${{ fromJSON(needs.changes.outputs.packages) }}
272+
steps:
273+
- uses: actions/checkout@v4
274+
- uses: actions/setup-java@v4
275+
with:
276+
distribution: temurin
277+
java-version: 17
278+
- run: .kokoro/dependencies.sh
279+
env:
280+
BUILD_SUBDIR: ${{matrix.package}}
269281
required:
270-
needs: [ changes, split-units, split-clirr ]
282+
needs: [ changes, split-units, split-clirr, split-dependencies ]
271283
name: conditional-required-check
272284
if: ${{ always() }} # Always run even if any "needs" jobs fail
273285
runs-on: ubuntu-22.04

.github/workflows/google-auth-library-java-ci.yaml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,20 @@ jobs:
7070
env:
7171
JOB_TYPE: clirr
7272
BUILD_SUBDIR: google-auth-library-java
73+
dependencies:
74+
needs: filter
75+
if: ${{ needs.filter.outputs.library == 'true' }}
76+
runs-on: ubuntu-latest
77+
steps:
78+
- uses: actions/checkout@v4
79+
- uses: actions/setup-java@v4
80+
with:
81+
distribution: temurin
82+
java-version: 17
83+
- run: .kokoro/dependencies.sh
7384

7485
required:
75-
needs: [ units-logging, clirr ]
86+
needs: [ units-logging, clirr, dependencies ]
7687
name: conditional-required-check
7788
if: ${{ always() }} # Always run even if any "needs" jobs fail
7889
runs-on: ubuntu-22.04

.github/workflows/java-spanner-jdbc-ci.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,16 +99,12 @@ jobs:
9999
needs: filter
100100
if: ${{ needs.filter.outputs.library == 'true' }}
101101
runs-on: ubuntu-latest
102-
strategy:
103-
matrix:
104-
java: [17]
105102
steps:
106103
- uses: actions/checkout@v4
107104
- uses: actions/setup-java@v4
108105
with:
109106
distribution: temurin
110-
java-version: ${{matrix.java}}
111-
- run: java -version
107+
java-version: 17
112108
- run: .kokoro/dependencies.sh
113109
javadoc:
114110
needs: filter

.github/workflows/java-storage-nio-ci.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,16 +99,12 @@ jobs:
9999
needs: filter
100100
if: ${{ needs.filter.outputs.library == 'true' }}
101101
runs-on: ubuntu-latest
102-
strategy:
103-
matrix:
104-
java: [17]
105102
steps:
106103
- uses: actions/checkout@v4
107104
- uses: actions/setup-java@v4
108105
with:
109106
distribution: temurin
110-
java-version: ${{matrix.java}}
111-
- run: java -version
107+
java-version: 17
112108
- run: .kokoro/dependencies.sh
113109
javadoc:
114110
needs: filter

.github/workflows/sdk-platform-java-ci.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,20 @@ jobs:
6969
JOB_TYPE: clirr
7070
BUILD_SUBDIR: sdk-platform-java
7171

72+
dependencies:
73+
needs: filter
74+
if: ${{ needs.filter.outputs.library == 'true' }}
75+
runs-on: ubuntu-latest
76+
steps:
77+
- uses: actions/checkout@v4
78+
- uses: actions/setup-java@v4
79+
with:
80+
distribution: temurin
81+
java-version: 17
82+
- run: .kokoro/dependencies.sh
83+
env:
84+
BUILD_SUBDIR: sdk-platform-java
85+
7286
sdk-platform-java-8:
7387
needs: filter
7488
if: ${{ needs.filter.outputs.library == 'true' }}

0 commit comments

Comments
 (0)