Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release: v2.12.3 #1466

Merged
merged 7 commits into from
Feb 16, 2023
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 .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: 1.19
go-version: '1.20'

- name: Check out code
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_dep.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: 1.19
go-version: '1.20'

- name: Download dependencies
run: go mod download
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_grpc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: 1.19
go-version: '1.20'

- name: Check out code
uses: actions/checkout@v3
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3 # action page: <https://github.com/actions/setup-go>
with:
go-version: 1.19
go-version: '1.19'

- name: Run linter
uses: golangci/golangci-lint-action@v3.3.1
uses: golangci/golangci-lint-action@v3.4.0
with:
version: v1.50 # without patch version
version: v1.51 # without patch version
only-new-issues: false # show only new issues if it's a pull request
args: --build-tags=safe --timeout=10m

Expand All @@ -56,7 +56,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: 1.19
go-version: '1.20'

- name: Check out code
uses: actions/checkout@v3
Expand All @@ -74,7 +74,7 @@ jobs:
run: go mod download

- name: Run Unit tests
run: go test -race -covermode=atomic -coverprofile /tmp/coverage.txt ./...
run: go test -v -race -covermode=atomic -coverprofile /tmp/coverage.txt ./...

- name: Upload Coverage report to CodeCov
continue-on-error: true
Expand All @@ -94,7 +94,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3 # action page: <https://github.com/actions/setup-go>
with:
go-version: 1.19
go-version: '1.20'

- name: Check out code
uses: actions/checkout@v3
Expand Down
20 changes: 19 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
# CHANGELOG

###### tags: `roadrunner` `v2.12.3`

## v2.12.3 (16.02.2023)

## <center> πŸš€ v2.12.3 πŸš€ </center>

## <center>πŸ‘€ New: <center>

- βœ’οΈ **Composer.json:** add contributors, funds, project description: [PR](https://github.com/roadrunner-server/roadrunner/pull/1451), (thanks @roxblnfk)


### <center>🧹 Chore:</center>

- πŸ§‘β€πŸ­ **Dependencies**: update project dependencies.
- πŸ§‘β€πŸ­ **Go**: update Go to `1.20`.

---

###### tags: `roadrunner` `v2.12.2`

## v2.12.2 (12.01.2023)
Expand All @@ -11,7 +29,7 @@
- βœ’οΈ **AMQP plugin:** Custom headers in AMQP driver, [FR](https://github.com/roadrunner-server/roadrunner/issues/1388), (thanks @ykweb)


### <center>🩹 Fixes:</center>
### <center>🩹 Fixes:</center>

- πŸ› **Velox**: Unable to build RoadRunner with custom velox configuration, [BUG](https://github.com/roadrunner-server/roadrunner/issues/1400), (thanks @mprokocki)
- πŸ› **RR**: JSON Schema - wrong type for service `exec_timeout` option, [BUG](https://github.com/roadrunner-server/roadrunner/issues/1410), (thanks @Chi-teck)
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Image page: <https://hub.docker.com/_/golang>
FROM --platform=${TARGETPLATFORM:-linux/amd64} golang:1.19-alpine as builder
FROM --platform=${TARGETPLATFORM:-linux/amd64} golang:1.20-alpine as builder

# app version and build date must be passed during image building (version without any prefix).
# e.g.: `docker build --build-arg "APP_VERSION=1.2.3" --build-arg "BUILD_TIME=$(date +%FT%T%z)" .`
Expand Down
26 changes: 12 additions & 14 deletions cmd/rr/command_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,24 @@ import (
"io"
"os"
"testing"
"time"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

func Test_Main(t *testing.T) {
os.Args = []string{"rr", "--help"}
exitFn = func(code int) { assert.Equal(t, 0, code) }

r, w, err := os.Pipe()
require.NoError(t, err)
r, w, _ := os.Pipe()
os.Stdout = w

main()
_ = w.Close()
buf := new(bytes.Buffer)
_, err = io.Copy(buf, r)
require.NoError(t, err)

_ = r.SetReadDeadline(time.Now().Add(time.Second))
_, _ = io.Copy(buf, r)

assert.Contains(t, buf.String(), "Usage:")
assert.Contains(t, buf.String(), "Available Commands:")
Expand All @@ -33,15 +33,13 @@ func Test_MainWithoutCommands(t *testing.T) {
os.Args = []string{"rr"}
exitFn = func(code int) { assert.Equal(t, 0, code) }

r, w, err := os.Pipe()
require.NoError(t, err)
r, w, _ := os.Pipe()
os.Stdout = w

main()
_ = w.Close()
buf := new(bytes.Buffer)
_, err = io.Copy(buf, r)
require.NoError(t, err)
_ = r.SetReadDeadline(time.Now().Add(time.Second))
_, _ = io.Copy(buf, r)

assert.Contains(t, buf.String(), "Usage:")
assert.Contains(t, buf.String(), "Available Commands:")
Expand All @@ -52,15 +50,15 @@ func Test_MainUnknownSubcommand(t *testing.T) {
os.Args = []string{"", "foobar"}
exitFn = func(code int) { assert.Equal(t, 1, code) }

r, w, err := os.Pipe()
require.NoError(t, err)
r, w, _ := os.Pipe()
os.Stderr = w

main()
_ = w.Close()
buf := new(bytes.Buffer)
_, err = io.Copy(buf, r)
require.NoError(t, err)

_ = r.SetReadDeadline(time.Now().Add(time.Second))
_, _ = io.Copy(buf, r)

assert.Contains(t, buf.String(), "unknown command")
assert.Contains(t, buf.String(), "foobar")
Expand Down
Loading