diff options
author | Valery Piashchynski <[email protected]> | 2021-03-09 20:40:25 +0300 |
---|---|---|
committer | GitHub <[email protected]> | 2021-03-09 20:40:25 +0300 |
commit | f47028a810ffcbf0f30e3c0151649e7670cdc8ed (patch) | |
tree | 08a017068413f9584c5e335ce4d265294cef7af0 | |
parent | 0a355178427814cbf91726d8295d2aa208e8de13 (diff) | |
parent | a1a773f2fe774b4517125656a4533ec35d7fa8b9 (diff) |
Merge pull request #580 from spiral/release-v2.0.1v2.0.1
⥠feat(release): release v2.0.1
-rw-r--r-- | .github/dependabot.yml | 2 | ||||
-rw-r--r-- | .github/workflows/codeql-analysis.yml | 72 | ||||
-rw-r--r-- | .github/workflows/linters.yml | 2 | ||||
-rw-r--r-- | .github/workflows/linux.yml | 2 | ||||
-rwxr-xr-x | .rr.yaml | 228 | ||||
-rw-r--r-- | CHANGELOG.md | 9 | ||||
-rwxr-xr-x | bors.toml | 8 | ||||
-rw-r--r-- | go.mod | 4 | ||||
-rw-r--r-- | go.sum | 4 |
9 files changed, 56 insertions, 275 deletions
diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 3483c95e..2c561205 100644 --- 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 index f630ff40..c685aee1 100644 --- 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 index 8829ffe4..a2294ed9 100644 --- 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 index 05b0d2f7..00057e38 100644 --- 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 deleted file mode 100755 index 1b40d526..00000000 --- a/.rr.yaml +++ /dev/null @@ -1,228 +0,0 @@ -###################################################################################### -# THIS IS SAMPLE OF THE CONFIGURATION # -# IT'S NOT A DEFAULT CONFIGURATION, IT'S JUST A REFERENCE TO ALL OPTIONS AND PLUGINS # -###################################################################################### -rpc: - listen: tcp://127.0.0.1:6001 - -server: - command: "php tests/psr-worker-bench.php" - # optional - user: "" - # optional - group: "" - env: - - SOME_KEY: "SOME_VALUE" - - SOME_KEY2: "SOME_VALUE2" - relay: "pipes" - relay_timeout: 20s - - -# optional for development -logs: - # default - mode: development - level: debug - encoding: console - output: stderr - err_output: stderr - channels: - http: - mode: development - level: panic - encoding: console - output: stdout - server: - mode: production - level: info - encoding: console - output: stderr - rpc: - mode: production - level: debug - encoding: console - output: stderr - -# Workflow and activity mesh service -temporal: - activities: - num_workers: 4 - # default 0 - no limit - max_jobs: 0 - # default 1 minute - allocate_timeout: 60s - # default 1 minute - destroy_timeout: 60s - # supervisor used to control http workers - supervisor: - # watch_tick defines how often to check the state of the workers (seconds) - watch_tick: 1s - # ttl defines maximum time worker is allowed to live (seconds) - ttl: 0 - # idle_ttl defines maximum duration worker can spend in idle mode after first use. Disabled when 0 (seconds) - idle_ttl: 0 - # exec_ttl defines maximum lifetime per job (seconds) - exec_ttl: 0 - # max_worker_memory limits memory usage per worker (MB) - max_worker_memory: 100 - -http: - # host and port separated by semicolon - address: 127.0.0.1:44933 - max_request_size: 1024 - # middlewares for the http plugin, order matters - middleware: [ "gzip", "headers" ] - # uploads - uploads: - forbid: [ ".php", ".exe", ".bat" ] - trusted_subnets: - [ - "10.0.0.0/8", - "127.0.0.0/8", - "172.16.0.0/12", - "192.168.0.0/16", - "::1/128", - "fc00::/7", - "fe80::/10", - ] - # headers - headers: - cors: - allowed_origin: "*" - allowed_headers: "*" - allowed_methods: "GET,POST,PUT,DELETE" - allow_credentials: true - exposed_headers: "Cache-Control,Content-Language,Content-Type,Expires,Last-Modified,Pragma" - max_age: 600 - request: - input: "custom-header" - response: - output: "output-header" - # http static - static: - dir: "tests" - forbid: [ "" ] - request: - "input": "custom-header" - response: - "output": "output-header" - - pool: - # default - num of logical CPUs - num_workers: 6 - # default 0 - no limit - max_jobs: 0 - # default 1 minute - allocate_timeout: 60s - # default 1 minute - destroy_timeout: 60s - # supervisor used to control http workers - supervisor: - # watch_tick defines how often to check the state of the workers (seconds) - watch_tick: 1s - # ttl defines maximum time worker is allowed to live (seconds) (soft) - ttl: 0 - # idle_ttl defines maximum duration worker can spend in idle mode after first use. Disabled when 0 (seconds) - idle_ttl: 10s - # exec_ttl defines maximum lifetime per job (seconds) - exec_ttl: 10s - # max_worker_memory limits memory usage per worker (MB) - max_worker_memory: 100 - - ssl: - # host and port separated by semicolon (default :443) - address: :8892 - redirect: false - cert: fixtures/server.crt - key: fixtures/server.key - root_ca: root.crt - fcgi: - address: tcp://0.0.0.0:7921 - http2: - h2c: false - max_concurrent_streams: 128 - -# plugin which can be used in other Golang plugins -# this is not an PHP plugin -redis: - # UniversalClient is an abstract client which - based on the provided options - - # can connect to either clusters, or sentinel-backed failover instances - # or simple single-instance servers. This can be useful for testing - # cluster-specific applications locally. - # if the number of addrs is 1 and master_name is empty, a single-node redis Client will be returned - # if the number of addrs is two or more, a ClusterClient will be returned - addrs: - - "localhost:6379" - # if a MasterName is passed a sentinel-backed FailoverClient will be returned - master_name: "" - username: "" - password: "" - db: 0 - sentinel_password: "" - route_by_latency: false - route_randomly: false - dial_timeout: 0 # accepted values [1s, 5m, 3h] - max_retries: 1 - min_retry_backoff: 0 # accepted values [1s, 5m, 3h] - max_retry_backoff: 0 # accepted values [1s, 5m, 3h] - pool_size: 0 - min_idle_conns: 0 - max_conn_age: 0 # accepted values [1s, 5m, 3h] - read_timeout: 0 # accepted values [1s, 5m, 3h] - write_timeout: 0 # accepted values [1s, 5m, 3h] - pool_timeout: 0 # accepted values [1s, 5m, 3h] - idle_timeout: 0 # accepted values [1s, 5m, 3h] - idle_check_freq: 0 # accepted values [1s, 5m, 3h] - read_only: false - -# boltdb simple driver -boltdb: - dir: "." - file: "rr" - bucket: "test" - permissions: 0777 - # keys ttl check interval - TTL: 60 # seconds - -# memcached driver -memcached: - addr: - - "localhost:11211" - -# in memory KV driver -memory: - # keys ttl check interval - interval: 60 - -metrics: - # prometheus client address (path /metrics added automatically) - address: localhost:2112 - collect: - app_metric: - type: histogram - help: "Custom application metric" - labels: [ "type" ] - buckets: [ 0.1, 0.2, 0.3, 1.0 ] - # objectives defines the quantile rank estimates with their respective - # absolute error [ for summary only ] - objectives: - - 1.4: 2.3 - - 2.0: 1.4 - -reload: - # sync interval - interval: 1s - # global patterns to sync - patterns: [ ".go" ] - # list of included for sync services - services: - http: - # recursive search for file patterns to add - recursive: true - # ignored folders - ignore: [ "vendor" ] - # service specific file pattens to sync - patterns: [ ".php", ".go", ".md" ] - # directories to sync. If recursive is set to true, - # recursive sync will be applied only to the directories in `dirs` section - dirs: [ "." ] diff --git a/CHANGELOG.md b/CHANGELOG.md index 64a2b590..3db752fe 100644 --- 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) ------------------- @@ -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) ', ] @@ -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 // =========== @@ -380,8 +380,8 @@ github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/viper v1.7.1 h1:pM5oEahlgWv/WnHXpgbKz7iLIxRf65tye2Ci+XFK5sk= github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= -github.com/spiral/endure v1.0.0-RC.2 h1:w5NBxxz00cwTJ7fVRwU73zUxftXPIpT/TrGKntJ7bkI= -github.com/spiral/endure v1.0.0-RC.2/go.mod h1:+gB0/jI9tXdHgv0x4P9vXLER8fLgwt9a7aPi0QZeJHE= +github.com/spiral/endure v1.0.0 h1:RCHtsfqmfjYhTnj1YK9tc7olU9eLhAmVpcT6q1WL9iI= +github.com/spiral/endure v1.0.0/go.mod h1:+gB0/jI9tXdHgv0x4P9vXLER8fLgwt9a7aPi0QZeJHE= github.com/spiral/errors v1.0.5/go.mod h1:SwMSZVdZkkJVgXNNafccqOaxWg0XPzVU/dEdUEInE0o= github.com/spiral/errors v1.0.9 h1:RcVZ7a1RYkaT3HWFGDuQiDB02pG6yqh7715Uwd7urwM= github.com/spiral/errors v1.0.9/go.mod h1:SwMSZVdZkkJVgXNNafccqOaxWg0XPzVU/dEdUEInE0o= |