Skip to content

Commit 4bebb49

Browse files
authored
Updating golangci-lint version and default trunk name changes (#495)
* Replacing the usages of GH master to GH main. (#493) * Updating golangci-lint version as its incompatible with current version of golangci-lint-action
1 parent daa8f11 commit 4bebb49

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

.github/workflows/analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ name: Analysis
44

55
on:
66
push:
7-
branches: [ master ]
7+
branches: [ main ]
88
pull_request:
9-
branches: [ master ]
9+
branches: [ main ]
1010
schedule:
1111
- cron: 13 7 * * 6
1212

@@ -23,7 +23,7 @@ jobs:
2323
- name: golangci-lint
2424
uses: golangci/golangci-lint-action@08e2f20817b15149a52b5b3ebe7de50aff2ba8c5
2525
with:
26-
version: v1.49.0
26+
version: v1.52.2
2727

2828
- name: shellcheck
2929
uses: azohra/shell-linter@6bbeaa868df09c34ddc008e6030cfe89c03394a1

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ name: Test
44

55
on:
66
push:
7-
branches: [master]
7+
branches: [main]
88
pull_request:
9-
branches: [master]
9+
branches: [main]
1010

1111
jobs:
1212
test:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ development and CI environments.
8282
## Clients
8383

8484
* [toxiproxy-ruby](https://github.com/Shopify/toxiproxy-ruby)
85-
* [toxiproxy-go](https://github.com/Shopify/toxiproxy/tree/master/client)
85+
* [toxiproxy-go](https://github.com/Shopify/toxiproxy/tree/main/client)
8686
* [toxiproxy-python](https://github.com/douglas/toxiproxy-python)
8787
* [toxiproxy.net](https://github.com/mdevilliers/Toxiproxy.Net)
8888
* [toxiproxy-php-client](https://github.com/ihsw/toxiproxy-php-client)

RELEASE.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ Ensure your local workstation is configured to be able to [Sign commits](https:/
2020
### Checkout latest code
2121

2222
```shell
23-
git checkout master
24-
git pull origin master
23+
git checkout main
24+
git pull origin main
2525
```
2626

2727
### Update the [CHANGELOG.md](CHANGELOG.md)
@@ -43,9 +43,9 @@ git tag -s "v$RELEASE_VERSION" # When prompted for a commit message, enter the '
4343
make test-release
4444
```
4545

46-
- Push to Master Branch
46+
- Push to Main Branch
4747
```shell
48-
git push origin master --follow-tags
48+
git push origin main --follow-tags
4949
```
5050

5151
## Push Release Tag

0 commit comments

Comments
 (0)