Skip to content

Commit

Permalink
Updating golangci-lint version and default trunk name changes (#495)
Browse files Browse the repository at this point in the history
* Replacing the usages of GH master to GH main. (#493)

* Updating golangci-lint version as its incompatible with current version of golangci-lint-action
  • Loading branch information
dianadevasia committed Apr 18, 2023
1 parent daa8f11 commit 4bebb49
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ name: Analysis

on:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]
branches: [ main ]
schedule:
- cron: 13 7 * * 6

Expand All @@ -23,7 +23,7 @@ jobs:
- name: golangci-lint
uses: golangci/golangci-lint-action@08e2f20817b15149a52b5b3ebe7de50aff2ba8c5
with:
version: v1.49.0
version: v1.52.2

- name: shellcheck
uses: azohra/shell-linter@6bbeaa868df09c34ddc008e6030cfe89c03394a1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ name: Test

on:
push:
branches: [master]
branches: [main]
pull_request:
branches: [master]
branches: [main]

jobs:
test:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ development and CI environments.
## Clients

* [toxiproxy-ruby](https://github.com/Shopify/toxiproxy-ruby)
* [toxiproxy-go](https://github.com/Shopify/toxiproxy/tree/master/client)
* [toxiproxy-go](https://github.com/Shopify/toxiproxy/tree/main/client)
* [toxiproxy-python](https://github.com/douglas/toxiproxy-python)
* [toxiproxy.net](https://github.com/mdevilliers/Toxiproxy.Net)
* [toxiproxy-php-client](https://github.com/ihsw/toxiproxy-php-client)
Expand Down
8 changes: 4 additions & 4 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ Ensure your local workstation is configured to be able to [Sign commits](https:/
### Checkout latest code

```shell
git checkout master
git pull origin master
git checkout main
git pull origin main
```

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

- Push to Master Branch
- Push to Main Branch
```shell
git push origin master --follow-tags
git push origin main --follow-tags
```

## Push Release Tag
Expand Down

0 comments on commit 4bebb49

Please sign in to comment.