Merge pull request #580 from spiral/release-v2.0.1

⚡ feat(release): release v2.0.1
roadrunner-server · Mar 9, 2021 · f47028a · f47028a
2 parents 0a35517 + a1a773f
commit f47028a
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 275 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -8,5 +8,5 @@ updates:
   - package-ecosystem: gomod # See documentation for possible values
     directory: "/" # Location of package manifests
     schedule:
-      interval: "daily"
+      interval: daily
 
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -7,10 +7,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [roadrunner-core, roadrunner-binary]
+    branches: [ master ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [roadrunner-core, roadrunner-binary]
+    branches: [ master ]
   schedule:
     - cron: '0 15 * * 6'
 
@@ -24,48 +24,48 @@ jobs:
       matrix:
         # Override automatic language detection by changing the below list
         # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
-        language: ['go']
+        language: [ 'go' ]
         # Learn more...
         # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-      with:
-        # We must fetch at least the immediate parents so that if this is
-        # a pull request then we can checkout the head.
-        fetch-depth: 2
+      - name: Checkout repository
+        uses: actions/checkout@v2
+        with:
+          # We must fetch at least the immediate parents so that if this is
+          # a pull request then we can checkout the head.
+          fetch-depth: 2
 
-    # If this run was triggered by a pull request event, then checkout
-    # the head of the pull request instead of the merge commit.
-    - run: git checkout HEAD^2
-      if: ${{ github.event_name == 'pull_request' }}
+      # If this run was triggered by a pull request event, then checkout
+      # the head of the pull request instead of the merge commit.
+      - run: git checkout HEAD^2
+        if: ${{ github.event_name == 'pull_request' }}
 
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v1
+        with:
+          languages: ${{ matrix.language }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
+          # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+      # If this step fails, then you should remove it and run the build manually (see below)
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v1
 
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 https://git.io/JvXDl
 
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
+      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+      #    and modify them (or add more) to build your code if your project
+      #    uses a compiled language
 
-    #- run: |
-    #   make bootstrap
-    #   make release
+      #- run: |
+      #   make bootstrap
+      #   make release
 
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v1
diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
@@ -21,5 +21,5 @@ jobs:
       - name: Run linter
         uses: golangci/golangci-lint-action@v2 # Action page: <https://github.com/golangci/golangci-lint-action>
         with:
-          version: v1.35 # without patch version
+          version: v1.37 # without patch version
           only-new-issues: false # show only new issues if it's a pull request
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -19,7 +19,7 @@ jobs:
       fail-fast: true
       matrix:
         php: [ "7.4", "8.0" ]
-        go: [ "1.14", "1.15" ]
+        go: [ "1.15", "1.16" ]
         os: [ ubuntu-20.04 ]
     steps:
       - name: Set up Go ${{ matrix.go }}

diff --git a/.rr.yaml b/.rr.yaml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,15 @@
 CHANGELOG
 =========
 
+v2.0.1 (09.03.2021)
+-------------------
+- 🐛 Fix: incorrect PHP command validation
+- 🐛 Fix: ldflags properly inject RR version
+- ⬆️ Update: README, links to the go.pkg from v1 to v2
+- 📦 Bump golang version in the Dockerfile and in the `go.mod` to 1.16
+- 📦 Bump Endure container to v1.0.0.
+
+
 v2.0.0 (02.03.2021)
 -------------------
 

diff --git a/bors.toml b/bors.toml
@@ -1,11 +1,11 @@
 status = [
-    'Linux / Build (Go 1.14, PHP 7.4, OS ubuntu-20.04)',
+    'Linux / Build (Go 1.16, PHP 7.4, OS ubuntu-20.04)',
     'Linux / Build (Go 1.15, PHP 7.4, OS ubuntu-20.04)',
-    'Linux / Build (Go 1.14, PHP 8.0, OS ubuntu-20.04)',
+    'Linux / Build (Go 1.16, PHP 8.0, OS ubuntu-20.04)',
     'Linux / Build (Go 1.15, PHP 8.0, OS ubuntu-20.04)',
-    'macOS / Build (Go 1.14, PHP 7.4, OS macos-latest)',
+    'macOS / Build (Go 1.16, PHP 7.4, OS macos-latest)',
     'macOS / Build (Go 1.15, PHP 7.4, OS macos-latest)',
-    'macOS / Build (Go 1.14, PHP 8.0, OS macos-latest)',
+    'macOS / Build (Go 1.16, PHP 8.0, OS macos-latest)',
     'macOS / Build (Go 1.15, PHP 8.0, OS macos-latest)',
     'Linux / Golang-CI (lint) ',
 ]

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/spiral/roadrunner/v2
 
-go 1.15
+go 1.16
 
 require (
 	github.com/NYTimes/gziphandler v1.1.1
@@ -20,7 +20,7 @@ require (
 	github.com/shirou/gopsutil v3.21.2+incompatible
 	github.com/spf13/viper v1.7.1
 	// SPIRAL ====
-	github.com/spiral/endure v1.0.0-RC.2
+	github.com/spiral/endure v1.0.0
 	github.com/spiral/errors v1.0.9
 	github.com/spiral/goridge/v3 v3.0.1
 	// ===========