Skip to content

Commit

Permalink
chore: update docs for main switch (#1285)
Browse files Browse the repository at this point in the history
  • Loading branch information
codyoss committed Nov 4, 2021
1 parent 3f4d679 commit 603dbed
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/autoapprove.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: AutoApprove
on:
pull_request:
branches:
- master
- main
types:
- opened

Expand Down
6 changes: 3 additions & 3 deletions GettingStarted.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ The Go versions are pretty natural, but please forgive any small non-idiomatic t

Pick an API and a version of that API to install.
You can find the complete list by looking at the
[directories here](https://github.com/google/google-api-go-client/tree/master/).
[directories here](https://github.com/google/google-api-go-client/tree/main/).

For example, let's install the
[urlshortener's version 1 API](https://godoc.org/google.golang.org/api/urlshortener/v1):
Expand Down Expand Up @@ -125,8 +125,8 @@ For instance, the urlshortener API has just the "Url" sub-service:
```

For a more complete example, see
[urlshortener.go](https://github.com/google/google-api-go-client/tree/master/examples/urlshortener.go)
in the [examples directory](https://github.com/google/google-api-go-client/tree/master/examples/).
[urlshortener.go](https://github.com/google/google-api-go-client/tree/main/examples/urlshortener.go)
in the [examples directory](https://github.com/google/google-api-go-client/tree/main/examples/).
(the examples use some functions in `main.go` in the same directory)

## Error Handling
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ func main() {
}
```

* For a longer tutorial, see the [Getting Started guide](https://github.com/google/google-api-go-client/blob/master/GettingStarted.md).
* For examples, see the [examples directory](https://github.com/google/google-api-go-client/tree/master/examples).
* For a longer tutorial, see the [Getting Started guide](https://github.com/google/google-api-go-client/blob/main/GettingStarted.md).
* For examples, see the [examples directory](https://github.com/google/google-api-go-client/tree/main/examples).
* For support, use the [golang-nuts](https://groups.google.com/group/golang-nuts) mailing list.

## Status
Expand Down
6 changes: 3 additions & 3 deletions RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
1. Determine the current release version with `git tag -l`. It should look
something like `vX.Y.Z`. We'll call the current version `$CV` and the new
version `$NV`.
1. On master, run `git log $CV..` to list all the changes since the last
1. On main, run `git log $CV..` to list all the changes since the last
release.
1. `cd internal/version && go generate && cd ../..`
1. Edit `CHANGES.md` to include a summary of the changes.
1. Mail the CL containing the `CHANGES.md` changes. When the CL is approved,
submit it.
1. Without submitting any other CLs:
a. Switch to master.
a. Switch to main.
b. `git pull`
c. Tag the repo with the next version: `git tag $NV`.
d. Push the tag: `git push origin $NV`.
Expand All @@ -25,6 +25,6 @@ Releases are manually tagged (see above).

See:

* [Code for the cronjob, in the discovery-artifact-manager repo](https://github.com/googleapis/discovery-artifact-manager/blob/master/server/tasks/google_api_go_client.py)
* [Code for the cronjob, in the discovery-artifact-manager repo](https://github.com/googleapis/discovery-artifact-manager/blob/main/server/tasks/google_api_go_client.py)
* [List of cronjobs](https://console.cloud.google.com/appengine/cronjobs?project=discovery-artifact-manager)
* [App Engine stderr logs](https://console.cloud.google.com/logs/viewer?project=discovery-artifact-manager)
4 changes: 2 additions & 2 deletions testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on the these libraries.
## Testing HTTP services using fakes

*Note*: You can see the full
[example code using a fake here](https://github.com/googleapis/google-api-go-client/tree/master/internal/examples/fake).
[example code using a fake here](https://github.com/googleapis/google-api-go-client/tree/main/internal/examples/fake).

The services found in `google.golang.org/api` are all HTTP based.
Interactions with HTTP services can be faked by serving up your own in-memory
Expand Down Expand Up @@ -94,7 +94,7 @@ func TestTranslateText(t *testing.T) {
## Testing using mocks

*Note*: You can see the full
[example code using a mocks here](https://github.com/googleapis/google-api-go-client/tree/master/internal/examples/mock).
[example code using a mocks here](https://github.com/googleapis/google-api-go-client/tree/main/internal/examples/mock).

When mocking code you need to work with interfaces. Because the services in
`google.golang.org/api` use the builder pattern to construct and execute
Expand Down

0 comments on commit 603dbed

Please sign in to comment.