Skip to content

Commit 25f9d8c

Browse files
committed
Merge branch 'pr-13612' into feat/jspecify-add-nullmarked
2 parents 7229ede + 24f3e90 commit 25f9d8c

78 files changed

Lines changed: 15098 additions & 3445 deletions

File tree

Some content is hidden

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

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,5 @@
2020
/java-bigtable/ @googleapis/bigtable-team @googleapis/cloud-sdk-java-team @googleapis/cloud-sdk-librarian-team
2121
/java-firestore/ @googleapis/firestore-team @googleapis/cloud-sdk-java-team @googleapis/cloud-sdk-librarian-team
2222
/librarian.yaml @googleapis/cloud-sdk-java-team @googleapis/cloud-sdk-librarian-team
23+
/java-cloud-bom/ @googleapis/cloud-sdk-java-team
2324
/java-shared-config/ @googleapis/cloud-sdk-java-team @googleapis/cloud-sdk-librarian-team

.github/scripts/update_generation_config.sh

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

.github/workflows/ci.yaml

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ jobs:
4646
workflows:
4747
- '.github/workflows/**'
4848
src:
49-
- '!(google-auth-library-java|grpc-gcp-java|java-bigquery|java-bigquery-jdbc|java-bigquerystorage|java-bigtable|java-datastore|java-firestore|java-logging|java-logging-logback|java-pubsub|java-shared-config|java-spanner|java-storage)/**/*.java'
50-
- '!(google-auth-library-java|grpc-gcp-java|java-bigquery|java-bigquery-jdbc|java-bigquerystorage|java-bigtable|java-datastore|java-firestore|java-logging|java-logging-logback|java-pubsub|java-shared-config|java-spanner|java-storage)/**/pom.xml'
49+
- '!(google-auth-library-java|grpc-gcp-java|java-bigquery|java-bigquery-jdbc|java-bigquerystorage|java-bigtable|java-cloud-bom|java-datastore|java-firestore|java-logging|java-logging-logback|java-pubsub|java-shared-config|java-spanner|java-storage)/**/*.java'
50+
- '!(google-auth-library-java|grpc-gcp-java|java-bigquery|java-bigquery-jdbc|java-bigquerystorage|java-bigtable|java-cloud-bom|java-datastore|java-firestore|java-logging|java-logging-logback|java-pubsub|java-shared-config|java-spanner|java-storage)/**/pom.xml'
5151
- 'pom.xml'
5252
ci:
5353
- '.github/workflows/ci.yaml'
@@ -413,23 +413,4 @@ jobs:
413413
uses: googleapis/java-cloud-bom/tests/validate-bom@v26.79.0
414414
with:
415415
bom-path: gapic-libraries-bom/pom.xml
416-
generation-config-check:
417-
needs: bulk-filter
418-
if: ${{ needs.bulk-filter.outputs.runnable == 'true' }}
419-
runs-on: ubuntu-latest
420-
steps:
421-
- uses: actions/checkout@v4
422-
- name: validate generation configuration
423-
shell: bash
424-
run: |
425-
bash generation/run_generator_docker.sh "${library_generation_image_tag}" "${{ github.base_ref || 'main' }}" \
426-
-e GENERATOR_VERSION="${library_generation_image_tag}" \
427-
--quiet \
428-
-u "$(id -u):$(id -g)" \
429-
-v "$(pwd):${workspace_name}" \
430-
--entrypoint python \
431-
-- \
432-
/src/library_generation/cli/entry_point.py validate-generation-config
433-
env:
434-
library_generation_image_tag: 2.68.0
435-
workspace_name: /workspace
416+
Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
on:
2+
push:
3+
branches:
4+
- main
5+
pull_request:
6+
name: java-cloud-bom ci
7+
env:
8+
BUILD_SUBDIR: java-cloud-bom
9+
jobs:
10+
filter:
11+
runs-on: ubuntu-latest
12+
outputs:
13+
library: ${{ steps.filter.outputs.library }}
14+
steps:
15+
- uses: actions/checkout@v4
16+
- uses: dorny/paths-filter@v3
17+
id: filter
18+
with:
19+
filters: |
20+
library:
21+
- 'java-cloud-bom/**'
22+
- 'sdk-platform-java/**'
23+
- 'google-auth-library-java/**'
24+
bom-content-test:
25+
needs: filter
26+
if: ${{ needs.filter.outputs.library == 'true' && github.repository_owner == 'googleapis' }}
27+
runs-on: ubuntu-latest
28+
steps:
29+
- uses: actions/checkout@v4
30+
- uses: actions/setup-java@v5
31+
with:
32+
distribution: temurin
33+
java-version: 11
34+
cache: maven
35+
- run: java -version
36+
- name: Pre-install all BOM modules to populate local cache
37+
run: bash java-cloud-bom/tests/pre-install.sh
38+
shell: bash
39+
- name: Install BOMs
40+
run: |
41+
mvn -B -V -ntp install -f java-cloud-bom/pom.xml -DskipTests
42+
- name: Ensure the members of the Libraries BOM exist in Maven Central
43+
uses: ./java-cloud-bom/tests/validate-bom
44+
with:
45+
bom-path: java-cloud-bom/libraries-bom/pom.xml
46+
- name: Ensure the BOM has valid content (at releases)
47+
if: github.head_ref == 'release-please--branches--main'
48+
run: |
49+
mvn -B -V -ntp verify -Dtest="BomContentTest#testLibrariesBom"
50+
working-directory: java-cloud-bom/tests
51+
52+
bom-assertion-test:
53+
needs: filter
54+
if: ${{ needs.filter.outputs.library == 'true' && github.repository_owner == 'googleapis' }}
55+
name: BomContentAssertionsTest (Test for assertion logic in BomContentTest)
56+
runs-on: ubuntu-latest
57+
steps:
58+
- uses: actions/checkout@v4
59+
- uses: actions/setup-java@v5
60+
with:
61+
distribution: zulu
62+
java-version: 11
63+
- run: java -version
64+
- name: Pre-install all BOM modules to populate local cache
65+
run: bash java-cloud-bom/tests/pre-install.sh
66+
shell: bash
67+
- name: Install BOMs
68+
run: |
69+
mvn -B -V -ntp install -f java-cloud-bom/pom.xml -DskipTests
70+
- run: |
71+
mvn -B -V -ntp verify -Dtest="BomContentAssertionsTest"
72+
working-directory: java-cloud-bom/tests
73+
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
on:
2+
pull_request:
3+
paths:
4+
- 'release-note-generation/**'
5+
name: java-cloud-bom release-note-generation-test
6+
env:
7+
BUILD_SUBDIR: java-cloud-bom
8+
jobs:
9+
filter:
10+
runs-on: ubuntu-latest
11+
outputs:
12+
library: ${{ steps.filter.outputs.library }}
13+
steps:
14+
- uses: actions/checkout@v4
15+
- uses: dorny/paths-filter@v3
16+
id: filter
17+
with:
18+
filters: |
19+
library:
20+
- 'java-cloud-bom/**'
21+
test:
22+
needs: filter
23+
if: ${{ needs.filter.outputs.library == 'true' }}
24+
runs-on: ubuntu-latest
25+
steps:
26+
- uses: actions/checkout@v4
27+
- uses: actions/setup-java@v5
28+
with:
29+
distribution: temurin
30+
java-version: 11
31+
cache: maven
32+
- run: java -version
33+
- name: Run test in release-note-generation
34+
shell: bash
35+
run: |
36+
mvn -B -ntp verify -f java-cloud-bom/release-note-generation/pom.xml
37+
working-directory: java-cloud-bom/release-note-generation
38+
env:
39+
GH_TOKEN: ${{ github.token }}
40+
41+
dry-run:
42+
needs: filter
43+
if: ${{ needs.filter.outputs.library == 'true' }}
44+
runs-on: ubuntu-latest
45+
steps:
46+
- uses: actions/checkout@v4
47+
- uses: actions/setup-java@v5
48+
with:
49+
distribution: temurin
50+
java-version: 11
51+
cache: maven
52+
- run: java -version
53+
- name: Dry-run release-note-generation
54+
shell: bash
55+
run: |
56+
mvn -B -ntp compile -f java-cloud-bom/release-note-generation/pom.xml
57+
# This generates release_note.md file
58+
mvn -B -ntp exec:java -f java-cloud-bom/release-note-generation/pom.xml \
59+
-Dlibraries-bom.version="26.2.0" \
60+
-Dgoogle-cloud-java.version="1.1.0"
61+
working-directory: java-cloud-bom/release-note-generation
62+
env:
63+
GH_TOKEN: ${{ github.token }}
64+
- name: Show generated release note
65+
shell: bash
66+
run: |
67+
# This fails if the file does not exist
68+
cat release_note.md
69+
working-directory: java-cloud-bom/release-note-generation

0 commit comments

Comments
 (0)