From 0e5f37d059405b09e162bc7d16b0ec3fff3f3e14 Mon Sep 17 00:00:00 2001 From: Valery Piashchynski Date: Wed, 2 Dec 2020 10:33:58 +0300 Subject: Release 1.9.0 --- .github/workflows/ci-build.yml | 12 ++++++------ CHANGELOG.md | 7 +++++++ Dockerfile | 2 +- bors.toml | 12 ++++++------ build.sh | 2 +- 5 files changed, 21 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 930d1c17..ded84778 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -1,6 +1,6 @@ name: CI -on: [push, pull_request] +on: [ push, pull_request ] jobs: build: @@ -9,9 +9,9 @@ jobs: strategy: fail-fast: false matrix: - php: [7.3, 7.4, 8.0] - go: [1.14, 1.15] - os: [ubuntu-latest] + php: [ 7.3, 7.4, 8.0 ] + go: [ 1.14, 1.15 ] + os: [ ubuntu-20.04 ] env: GO111MODULE: on steps: @@ -100,7 +100,7 @@ jobs: golangci-check: name: runner / golangci-lint - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Check out code into the Go module directory uses: actions/checkout@v1 @@ -111,7 +111,7 @@ jobs: image: name: Build docker image - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Check out code uses: actions/checkout@v2 diff --git a/CHANGELOG.md b/CHANGELOG.md index f37c117c..db8ad552 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ CHANGELOG ========= +v1.9.0 (02.12.2020) +------------------- +- Update PHP minimal supported version to 7.3 +- Support PHP 8.0 +- Update Ubuntu version in GHA to 20.04 +- Update Golang version in the RR Dockerfile to 1.15.5 + v1.8.4 (21.10.2020) ------------------- - Update Goridge go dep to 2.4.6 diff --git a/Dockerfile b/Dockerfile index c857515f..67c06d28 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.14.3 as builder +FROM golang:1.15.5 as builder COPY . /src diff --git a/bors.toml b/bors.toml index 7743fb34..2c1160b9 100644 --- a/bors.toml +++ b/bors.toml @@ -1,10 +1,10 @@ status = [ -'Build (PHP 7.3, Go 1.15, OS ubuntu-latest)', -'Build (PHP 7.3, Go 1.14, OS ubuntu-latest)', -'Build (PHP 7.4, Go 1.15, OS ubuntu-latest)', -'Build (PHP 7.4, Go 1.14, OS ubuntu-latest)', -'Build (PHP 8, Go 1.15, OS ubuntu-latest)', -'Build (PHP 8, Go 1.14, OS ubuntu-latest)', +'Build (PHP 7.3, Go 1.15, OS ubuntu-20.04)', +'Build (PHP 7.3, Go 1.14, OS ubuntu-20.04)', +'Build (PHP 7.4, Go 1.15, OS ubuntu-20.04)', +'Build (PHP 7.4, Go 1.14, OS ubuntu-20.04)', +'Build (PHP 8, Go 1.15, OS ubuntu-20.04)', +'Build (PHP 8, Go 1.14, OS ubuntu-20.04)', 'runner / golangci-lint', 'Build docker image',] diff --git a/build.sh b/build.sh index df05fff0..64411dba 100755 --- a/build.sh +++ b/build.sh @@ -3,7 +3,7 @@ cd $(dirname "${BASH_SOURCE[0]}") OD="$(pwd)" # Pushes application version into the build information. -RR_VERSION=1.8.4 +RR_VERSION=1.9.0 # Hardcode some values to the core package LDFLAGS="$LDFLAGS -X github.com/spiral/roadrunner/cmd/rr/cmd.Version=${RR_VERSION}" -- cgit v1.2.3 From 22e112187c0b3333e7c09456068a5782d4a939bc Mon Sep 17 00:00:00 2001 From: Valery Piashchynski Date: Wed, 2 Dec 2020 10:58:36 +0300 Subject: Rotate port in the TestHandler_FormData_PUT test --- service/http/handler_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/http/handler_test.go b/service/http/handler_test.go index bc22183d..951bcbfd 100644 --- a/service/http/handler_test.go +++ b/service/http/handler_test.go @@ -852,7 +852,7 @@ func TestHandler_FormData_PUT(t *testing.T) { assert.NoError(t, h.rr.Start()) defer h.rr.Stop() - hs := &http.Server{Addr: ":8084", Handler: h} + hs := &http.Server{Addr: ":18084", Handler: h} defer func() { err := hs.Shutdown(context.Background()) if err != nil { -- cgit v1.2.3 From 3bf8089e46abd35e75fd36caa1038e80b57938eb Mon Sep 17 00:00:00 2001 From: Valery Piashchynski Date: Wed, 2 Dec 2020 11:25:19 +0300 Subject: Rotate ports in the Test_Service_PidEcho test --- service/limit/service_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/service/limit/service_test.go b/service/limit/service_test.go index b358c1c1..d6702a29 100644 --- a/service/limit/service_test.go +++ b/service/limit/service_test.go @@ -63,7 +63,7 @@ func Test_Service_PidEcho(t *testing.T) { err := c.Init(&testCfg{ httpCfg: `{ - "address": ":17029", + "address": ":27029", "workers":{ "command": "php ../../tests/http/client.php pid pipes", "pool": {"numWorkers": 1} @@ -91,8 +91,8 @@ func Test_Service_PidEcho(t *testing.T) { } }() - time.Sleep(time.Millisecond * 100) - req, err := http.NewRequest("GET", "http://localhost:17029", nil) + time.Sleep(time.Millisecond * 800) + req, err := http.NewRequest("GET", "http://localhost:27029", nil) if err != nil { return err } -- cgit v1.2.3 From 453133e7bb876a5f678ebd0847221495efbcd1ba Mon Sep 17 00:00:00 2001 From: Valery Piashchynski Date: Wed, 2 Dec 2020 11:42:56 +0300 Subject: Rotate ports in the Test_Service_Listener_MaxMemoryUsage test --- service/limit/service_test.go | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/service/limit/service_test.go b/service/limit/service_test.go index d6702a29..fae73166 100644 --- a/service/limit/service_test.go +++ b/service/limit/service_test.go @@ -2,6 +2,11 @@ package limit import ( "fmt" + "io/ioutil" + "net/http" + "testing" + "time" + "github.com/cenkalti/backoff/v4" json "github.com/json-iterator/go" "github.com/sirupsen/logrus" @@ -9,10 +14,6 @@ import ( "github.com/spiral/roadrunner/service" rrhttp "github.com/spiral/roadrunner/service/http" "github.com/stretchr/testify/assert" - "io/ioutil" - "net/http" - "testing" - "time" ) type testCfg struct { @@ -102,7 +103,6 @@ func Test_Service_PidEcho(t *testing.T) { return err } - b, err := ioutil.ReadAll(r.Body) if err != nil { return err @@ -137,7 +137,7 @@ func Test_Service_ListenerPlusTTL(t *testing.T) { c.Register(rrhttp.ID, &rrhttp.Service{}) c.Register(ID, &Service{}) - err := c.Init(&testCfg{ + err := c.Init(&testCfg{ httpCfg: `{ "address": ":7030", "workers":{ @@ -175,7 +175,6 @@ func Test_Service_ListenerPlusTTL(t *testing.T) { } }() - time.Sleep(time.Millisecond * 100) lastPID := getPID(s) @@ -190,7 +189,6 @@ func Test_Service_ListenerPlusTTL(t *testing.T) { return err } - b, err := ioutil.ReadAll(r.Body) if err != nil { return err @@ -278,7 +276,6 @@ func Test_Service_ListenerPlusIdleTTL(t *testing.T) { } }() - time.Sleep(time.Millisecond * 100) lastPID := getPID(s) @@ -415,7 +412,7 @@ func Test_Service_Listener_MaxMemoryUsage(t *testing.T) { err := c.Init(&testCfg{ httpCfg: `{ - "address": ":7033", + "address": ":10033", "workers":{ "command": "php ../../tests/http/client.php memleak pipes", "pool": {"numWorkers": 1} @@ -433,6 +430,7 @@ func Test_Service_Listener_MaxMemoryUsage(t *testing.T) { return err } + time.Sleep(time.Second * 3) s, _ := c.Get(rrhttp.ID) assert.NotNil(t, s) @@ -453,11 +451,11 @@ func Test_Service_Listener_MaxMemoryUsage(t *testing.T) { } }() - time.Sleep(time.Millisecond * 100) + time.Sleep(time.Millisecond * 500) lastPID := getPID(s) - req, err := http.NewRequest("GET", "http://localhost:7033", nil) + req, err := http.NewRequest("GET", "http://localhost:10033", nil) if err != nil { return err } -- cgit v1.2.3