Skip to content

Commit

Permalink
Merge pull request #50 from dunglas/github-action
Browse files Browse the repository at this point in the history
Improve the GitHub Action files
  • Loading branch information
dunglas authored Jul 8, 2020
2 parents 924f986 + c52c8af commit 2fdc394
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ a project may be further defined and clarified by project maintainers.
## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at dunglas+coc@gmail.com. All
reported by contacting the project team at kevin+coc@dunglas.fr. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Expand Down
24 changes: 24 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<!--
The commit message must follow the [Conventional Commits specification](https://www.conventionalcommits.org/).
The following types are allowed:
* `fix`: bug fix
* `feat`: new feature
* `docs`: change in the documentation
* `spec`: spec change
* `test`: test-related change
* `perf`: performance optimization
* `ci`: CI-related change
Examples:
fix: Fix something
feat: Introduce X
feat!: Introduce Y, BC break
docs: Add docs for X
spec: Z disambiguation
-->
12 changes: 7 additions & 5 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: CD
on:
push:
tags:
- '*'
- 'v*'

jobs:
release:
Expand All @@ -12,19 +12,21 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Install Go
uses: actions/setup-go@v1
uses: actions/setup-go@v2
with:
go-version: '1.13'
go-version: '1.14'
- name: Docker Hub Login
run: docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
env:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
- name: Release
uses: goreleaser/goreleaser-action@v1
uses: goreleaser/goreleaser-action@v2
with:
version: latest
args: release
args: release --rm-dist
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
strategy:
matrix:
go:
- '1.13'
- '1.14'
fail-fast: false
steps:
- name: Checkout
Expand Down Expand Up @@ -57,6 +57,6 @@ jobs:
- name: Test
run: go test -v -timeout 30s -coverprofile=cover.out github.com/dunglas/vulcain/gateway
- name: Upload coverage results
uses: teohhanhui/codecov-action@master
uses: codecov/codecov-action@v1
with:
token: ${{ secrets.CODECOV_TOKEN }}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ tl;dr:

The Vulcain Gateway Server is licensed under [AGPL-3.0](LICENSE). This license implies that if you modify the Vulcain Gateway Server, you must share those modifications. However, the AGPL-3.0 license applies only to the gateway server itself, **not to software used behind the gateway**.

For companies not wanting, or not able to use AGPL-3.0 licensed software, commercial licenses are also available. [Contact us for more information](mailto:dunglas+vulcain@gmail.com).
For companies not wanting, or not able to use AGPL-3.0 licensed software, commercial licenses are also available. [Contact us for more information](mailto:kevin+vulcain@dunglas.fr).

## Credits

Expand Down
2 changes: 1 addition & 1 deletion gateway/options_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ func TestInvalidUpstream(t *testing.T) {
os.Setenv("UPSTREAM", " http://foo.com")
defer os.Unsetenv("UPSTREAM")
_, err := NewOptionsFromEnv()
assert.EqualError(t, err, "parse http://foo.com: first path segment in URL cannot contain colon")
assert.EqualError(t, err, `parse " http://foo.com": first path segment in URL cannot contain colon`)
}

func TestInvalidMaxPushes(t *testing.T) {
Expand Down

0 comments on commit 2fdc394

Please sign in to comment.