Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gcb/format.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ steps:
go install github.com/google/yamlfmt/cmd/yamlfmt@v0.13.0
git ls-files -z -- '*.yaml' '*.yml' ':!:testdata/**' ':!:**/generated/**' ':!:librarian.yaml' | \
xargs -0 yamlfmt
V=$(cat .librarian-version.txt)
V=$(sed -n 's/^version: *//p' librarian.yaml)
go run github.com/googleapis/librarian/cmd/librarian@${V} tidy
waitFor: ['-']
env:
Expand Down
2 changes: 1 addition & 1 deletion .gcb/scripts/regenerate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ rustup component add rustfmt
rustup show active-toolchain -v

echo "Regenerate all the code"
version=$(cat /workspace/.librarian-version.txt)
version=$(sed -n 's/^version: *//p' /workspace/librarian.yaml)
go run github.com/googleapis/librarian/cmd/librarian@${version} generate --all

# If there is any difference between the generated code and the
Expand Down
1 change: 0 additions & 1 deletion .librarian-version.txt

This file was deleted.

25 changes: 12 additions & 13 deletions doc/contributor/howto-guide-generated-code-maintenance.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ You need to look at the [API list] for the pinned version of librarian, if the
API is not in the list:

1. Send a PR adding the API to librarian.
1. Send a PR to update `.librarian-version.txt`.
1. Send a PR to update the `version` field in `librarian.yaml`.

### Generate

Expand All @@ -53,7 +53,7 @@ This command will generate the library, add the library to Cargo and git, and
run the necessary tests:

```bash
V=$(cat .librarian-version.txt)
V=$(sed -n 's/^version: *//p' librarian.yaml)
# add library to librarian.yaml
go run github.com/googleapis/librarian/cmd/librarian@${V} add ${library}
# generate library
Expand All @@ -73,7 +73,7 @@ Run:

```bash
git checkout -b chore-update-shas-circa-$(date +%Y-%m-%d)
V=$(cat .librarian-version.txt)
V=$(sed -n 's/^version: *//p' librarian.yaml)
go run github.com/googleapis/librarian/cmd/librarian@${V} update discovery
go run github.com/googleapis/librarian/cmd/librarian@${V} update googleapis
go run github.com/googleapis/librarian/cmd/librarian@${V} generate --all
Expand Down Expand Up @@ -108,7 +108,7 @@ Run:
```bash
git fetch upstream
git checkout -b chore-bump-version-numbers-circa-$(date +%Y-%m-%d)
V=$(cat .librarian-version.txt)
V=$(sed -n 's/^version: *//p' librarian.yaml)
go run github.com/googleapis/librarian/cmd/librarian@${V} bump --all
go run github.com/googleapis/librarian/cmd/librarian@${V} generate --all
# It is safe to commit everything because `bump` stops you from updating a
Expand Down Expand Up @@ -210,7 +210,7 @@ Commit all these changes and send a PR.
Run:

```bash
V=$(cat .librarian-version.txt)
V=$(sed -n 's/^version: *//p' librarian.yaml)
go run github.com/googleapis/librarian/cmd/librarian@${V} generate --all
```

Expand All @@ -224,7 +224,7 @@ the library name from librarian.yaml.
Run:

```bash
V=$(cat .librarian-version.txt)
V=$(sed -n 's/^version: *//p' librarian.yaml)
go run github.com/googleapis/librarian/cmd/librarian@${V} generate google-cloud-secretmanager-v1
```

Expand All @@ -234,7 +234,7 @@ Someday `librarian` will be stable enough that we will be able to install it. At
that point we will be able to say:

```bash
V=$(cat .librarian-version.txt)
V=$(sed -n 's/^version: *//p' librarian.yaml)
go install github.com/googleapis/librarian/cmd/librarian@${V}
```

Expand Down Expand Up @@ -271,18 +271,17 @@ Wait for the PR to be approved and merged.

Then finish your PR in `google-cloud-rust`.

1. Update the default librarian version:
1. Update the librarian version in `librarian.yaml`:

```bash
GOPROXY=direct go list -m -u -f '{{.Version}}' github.com/googleapis/librarian@main >.librarian-version.txt
V=$(cat .librarian-version.txt)
sed -i.bak "s;^version: .*;version: ${V};" librarian.yaml
V=$(GOPROXY=direct go list -m -f '{{.Version}}' github.com/googleapis/librarian@main)
sed -i.bak "s;^version: .*;version: ${V};" librarian.yaml && rm librarian.yaml.bak
```

1. Update the generated code:

```bash
V=$(cat .librarian-version.txt)
V=$(sed -n 's/^version: *//p' librarian.yaml)
go run github.com/googleapis/librarian/cmd/librarian@${V} generate --all
```

Expand Down Expand Up @@ -319,7 +318,7 @@ example:

```
bash
V=$(cat .librarian-version.txt)
V=$(sed -n 's/^version: *//p' librarian.yaml)
go run github.com/googleapis/librarian/cmd/librarian@${V} generate google-cloud-apps-script-type
```

Expand Down
Loading