Skip to content

Commit f5ab65e

Browse files
authored
Merge branch 'main' into parthea-patch-1
2 parents 832efa0 + 7a55cb0 commit f5ab65e

File tree

203 files changed

+6431
-1640
lines changed

Some content is hidden

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

203 files changed

+6431
-1640
lines changed

.github/workflows/dart.yaml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,5 @@ jobs:
3838
run: git --version
3939
- name: Run internal/sidekick/dart tests
4040
run: go test -race ./internal/sidekick/dart
41-
- name: Run internal/librarian/dart tests
42-
run: go test -race -coverprofile=coverage.out -covermode=atomic ./internal/librarian/dart
43-
- name: Upload coverage report
44-
uses: codecov/codecov-action@v5
45-
with:
46-
token: ${{ secrets.CODECOV_TOKEN }}
41+
- name: Run internal/librarian/dart tests and check coverage
42+
run: go run ./tool/cmd/coverage ./internal/librarian/dart

.github/workflows/govulncheck.yaml

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

.github/workflows/java.yaml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,5 @@ jobs:
4444
# Verify plugins are executable (they don't support --version)
4545
test -x "$(which protoc-gen-java_grpc)"
4646
test -x "$(which protoc-gen-java_gapic)"
47-
- name: Run internal/librarian/java tests
48-
run: go test -race -coverprofile=coverage.out -covermode=atomic ./internal/librarian/java
49-
- name: Upload coverage report
50-
uses: codecov/codecov-action@v5
51-
with:
52-
token: ${{ secrets.CODECOV_TOKEN }}
47+
- name: Run internal/librarian/java tests and check coverage
48+
run: go run ./tool/cmd/coverage ./internal/librarian/java

.github/workflows/librarian.yaml

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,8 @@ jobs:
4646
- uses: actions/setup-go@v6
4747
with:
4848
go-version-file: "go.mod"
49-
- name: Run tests
50-
run: |
51-
go test -race -coverprofile=coverage.out -covermode=atomic ./internal/legacylibrarian/...
52-
- name: Upload coverage report
53-
uses: codecov/codecov-action@v5
54-
with:
55-
token: ${{ secrets.CODECOV_TOKEN }}
49+
- name: Run tests and check coverage
50+
run: go run ./tool/cmd/coverage ./internal/legacylibrarian/...
5651
test:
5752
runs-on: ubuntu-24.04
5853
# Presubmit jobs must complete within 5 minutes. See CONTRIBUTING.md.
@@ -65,14 +60,10 @@ jobs:
6560
- uses: ./.github/actions/install-protoc
6661
- name: Install Go tools
6762
run: go install tool
68-
- name: Run tests
63+
- name: Run tests and check coverage
6964
run: |
70-
go test -race -coverprofile=coverage.out -covermode=atomic \
65+
go run ./tool/cmd/coverage \
7166
$(go list ./... | grep -v -E 'internal/librarian/(dart|java|nodejs|python|rust)|internal/sidekick|internal/legacylibrarian')
72-
- name: Upload coverage report
73-
uses: codecov/codecov-action@v5
74-
with:
75-
token: ${{ secrets.CODECOV_TOKEN }}
7667
create-issue-on-failure:
7768
runs-on: ubuntu-24.04
7869
needs: [go-generate, legacylibrarian, test]

.github/workflows/nodejs.yaml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,5 @@ jobs:
5252
- name: Install synthtool
5353
run: |
5454
pip install gcp-synthtool@git+https://github.com/googleapis/synthtool@5aa438a342707842d11fbbb302c6277fbf9e4655
55-
- name: Run internal/librarian/nodejs tests
56-
run: go test -race -coverprofile=coverage.out -covermode=atomic ./internal/librarian/nodejs
57-
- name: Upload coverage report
58-
uses: codecov/codecov-action@v5
59-
with:
60-
token: ${{ secrets.CODECOV_TOKEN }}
55+
- name: Run internal/librarian/nodejs tests and check coverage
56+
run: go run ./tool/cmd/coverage ./internal/librarian/nodejs

.github/workflows/python.yaml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,5 @@ jobs:
5353
python -m pip install ruff==0.14.14
5454
- name: Verify git is available
5555
run: git --version
56-
- name: Run internal/librarian/python tests
57-
run: go test -race -coverprofile=coverage.out -covermode=atomic ./internal/librarian/python
58-
- name: Upload coverage report
59-
uses: codecov/codecov-action@v5
60-
with:
61-
token: ${{ secrets.CODECOV_TOKEN }}
56+
- name: Run internal/librarian/python tests and check coverage
57+
run: go run ./tool/cmd/coverage ./internal/librarian/python

.github/workflows/rust.yaml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,8 @@ jobs:
4242
tar --version
4343
- name: Run sidekick tests
4444
run: go test -race ./internal/sidekick/...
45-
- name: Run internal/librarian/rust tests
46-
run: go test -race -coverprofile=coverage.out -covermode=atomic ./internal/librarian/rust
47-
- name: Upload coverage report
48-
uses: codecov/codecov-action@v5
49-
with:
50-
token: ${{ secrets.CODECOV_TOKEN }}
45+
- name: Run internal/librarian/rust tests and check coverage
46+
run: go run ./tool/cmd/coverage ./internal/librarian/rust
5147
integration:
5248
runs-on: ubuntu-24.04
5349
if: github.event_name == 'push' && github.ref == 'refs/heads/main'

codecov.yml

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

doc/config-schema.md

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ This document describes the schema for the librarian.yaml.
1010
| `version` | string | Is the librarian tool version to use. |
1111
| `repo` | string | Is the repository name, such as "googleapis/google-cloud-python". It is used for:<br>- Providing to the Java GAPIC generator for observability features.<br>- Generating the .repo-metadata.json. |
1212
| `sources` | [Sources](#sources-configuration) (optional) | References external source repositories. |
13+
| `tools` | [Tools](#tools-configuration) (optional) | Defines required tools. |
1314
| `release` | [Release](#release-configuration) (optional) | Holds the configuration parameter for publishing and release subcommands. |
1415
| `default` | [Default](#default-configuration) (optional) | Contains default settings for all libraries. They apply to all libraries unless overridden. |
1516
| `libraries` | list of [Library](#library-configuration) (optional) | Contains configuration overrides for libraries that need special handling, and differ from default settings. |
@@ -18,10 +19,8 @@ This document describes the schema for the librarian.yaml.
1819

1920
| Field | Type | Description |
2021
| :--- | :--- | :--- |
21-
| `branch` | string | Sets the name of the release branch, typically `main` |
2222
| `ignored_changes` | list of string | Defines globs that are ignored in change analysis. |
2323
| `preinstalled` | map[string]string | Tools defines the list of tools that must be preinstalled.<br><br>This is indexed by the well-known name of the tool vs. its path, e.g. [preinstalled] cargo = /usr/bin/cargo |
24-
| `remote` | string | Sets the name of the source-of-truth remote for releases, typically `upstream`. |
2524
| `tools` | map[string][]Tool | Defines the list of tools to install, indexed by installer. |
2625

2726
## Tool Configuration
@@ -51,6 +50,19 @@ This document describes the schema for the librarian.yaml.
5150
| `sha256` | string | Is the expected hash of the tarball for this commit. |
5251
| `subpath` | string | Is a directory inside the fetched archive that should be treated as the root for operations. |
5352

53+
## Tools Configuration
54+
55+
| Field | Type | Description |
56+
| :--- | :--- | :--- |
57+
| `cargo` | list of [CargoTool](#cargotool-configuration) (optional) | Defines tools to install via cargo. |
58+
59+
## CargoTool Configuration
60+
61+
| Field | Type | Description |
62+
| :--- | :--- | :--- |
63+
| `name` | string | Is the cargo package name. |
64+
| `version` | string | Is the version to install. |
65+
5466
## Default Configuration
5567

5668
| Field | Type | Description |
@@ -71,6 +83,7 @@ This document describes the schema for the librarian.yaml.
7183
| :--- | :--- | :--- |
7284
| `name` | string | Is the library name, such as "secretmanager" or "storage". |
7385
| `version` | string | Is the library version. |
86+
| `preview` | [Library](#library-configuration) (optional) | Signifies that this API has a preview variant, and it contains overrides specific to the preview API variant. This is merged with the containing [Library], preferring those [Library.Preview] values that are set over their counterpart in the containing configuration.<br><br>The most common overrides are [Library.Version] and [Library.APIs], with the former containing a pre-release version based on the containing version of the stable client, and the latter being a subset of APIs, typically omitting alpha and beta paths.<br><br>The [Library.Output] may be a different location and derived on a per-language basis, but will not be serialized in the configuration.<br><br>Important: The boolean fields [Library.SkipRelease] and [Library.SkipGenerate] set in the containing config will always be applied to the Preview library as well, because previews are related to the stable library and should be managed identically. |
7487
| `apis` | list of [API](#api-configuration) (optional) | API specifies which googleapis API to generate from (for generated libraries). |
7588
| `copyright_year` | string | Is the copyright year for the library. |
7689
| `description_override` | string | Overrides the library description. |

0 commit comments

Comments
 (0)