summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/ci-build.yml12
-rw-r--r--CHANGELOG.md7
-rw-r--r--Dockerfile2
-rw-r--r--bors.toml12
-rwxr-xr-xbuild.sh2
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}"