summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Piashchynski <[email protected]>2021-02-04 13:47:19 +0300
committerGitHub <[email protected]>2021-02-04 13:47:19 +0300
commitd1945fe09b9de3d79ddbf70da26a7dff34ce12b1 (patch)
tree070aea60c4f287b0e573f77d731c9a5622779797
parent250bd2bf520eed0edc590aaea31339da46c6d54d (diff)
parent1baff6e1683e9dd3be45b6cdefbaf8d6e9dd5e54 (diff)
Merge pull request #529 from spiral/release_beta_25
Release 25
-rw-r--r--.dockerignore3
-rw-r--r--.github/dependabot.yml2
-rw-r--r--.github/workflows/codeql-analysis.yml74
-rwxr-xr-x.rr.yaml4
-rw-r--r--cmd/go.mod4
-rw-r--r--cmd/go.sum12
6 files changed, 51 insertions, 48 deletions
diff --git a/.dockerignore b/.dockerignore
index a570712f..42e752c9 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,5 +1,4 @@
.dockerignore
.git
.gitignore
-.github
-/bin \ No newline at end of file
+.github \ No newline at end of file
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 75e40110..2847f9de 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -7,65 +7,65 @@ name: "CodeQL"
on:
push:
- branches: [master]
+ branches: [ master, roadrunner-binary ]
pull_request:
# The branches below must be a subset of the branches above
- branches: [master]
+ branches: [ master, roadrunner-binary ]
schedule:
- cron: '0 15 * * 6'
jobs:
analyze:
name: Analyze
- runs-on: ubuntu-latest
+ runs-on: ubuntu-20.04
strategy:
fail-fast: false
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/.rr.yaml b/.rr.yaml
index 1c1a0af2..4cdc4326 100755
--- a/.rr.yaml
+++ b/.rr.yaml
@@ -61,9 +61,13 @@ http:
"output": "output-header"
pool:
+ # default - num of logical CPUs
num_workers: 6
+ # default 0
max_jobs: 0
+ # default 1 minute
allocate_timeout: 60s
+ # default 1 minute
destroy_timeout: 60s
supervisor:
# watch_tick defines how often to check the state of the workers (seconds)
diff --git a/cmd/go.mod b/cmd/go.mod
index 02e24f61..45a918df 100644
--- a/cmd/go.mod
+++ b/cmd/go.mod
@@ -10,8 +10,8 @@ require (
github.com/spiral/endure v1.0.0-beta.22
github.com/spiral/errors v1.0.9
github.com/spiral/goridge/v3 v3.0.0
- github.com/spiral/roadrunner/v2 v2.0.0-beta.22
- github.com/temporalio/roadrunner-temporal v1.0.0-beta.4
+ github.com/spiral/roadrunner/v2 v2.0.0-beta.24
+ github.com/temporalio/roadrunner-temporal v1.0.0-beta.5
github.com/vbauerster/mpb/v5 v5.4.0
go.uber.org/multierr v1.6.0
)
diff --git a/cmd/go.sum b/cmd/go.sum
index 6e7a98d4..15f4f25f 100644
--- a/cmd/go.sum
+++ b/cmd/go.sum
@@ -33,7 +33,7 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF
github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc=
-github.com/alicebob/miniredis/v2 v2.14.1/go.mod h1:uS970Sw5Gs9/iK3yBg0l9Uj9s25wXxSpQUE9EaJ/Blg=
+github.com/alicebob/miniredis/v2 v2.14.2/go.mod h1:gquAfGbzn92jvtrSC69+6zZnwSODVXVpYDRaGhWaL6I=
github.com/andybalholm/brotli v1.0.0 h1:7UCwP93aiSfvWpapti8g88vVVGp2qqtGyePsSuDafo4=
github.com/andybalholm/brotli v1.0.0/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y=
github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
@@ -436,8 +436,8 @@ github.com/spiral/errors v1.0.9 h1:RcVZ7a1RYkaT3HWFGDuQiDB02pG6yqh7715Uwd7urwM=
github.com/spiral/errors v1.0.9/go.mod h1:SwMSZVdZkkJVgXNNafccqOaxWg0XPzVU/dEdUEInE0o=
github.com/spiral/goridge/v3 v3.0.0 h1:FIz6wHaob5KynpOfzVpzj4bmqbEelGPFyuEf4i2+CG8=
github.com/spiral/goridge/v3 v3.0.0/go.mod h1:XFQGc42KNzo/hPIXPki7mEkFTf9v/T7qFk/TYJjMtzE=
-github.com/spiral/roadrunner/v2 v2.0.0-beta.22 h1:MboP310ufkIqtBkpnsRFeafZNUEwfDIWqSVjNEEnl6Q=
-github.com/spiral/roadrunner/v2 v2.0.0-beta.22/go.mod h1:mK4r1q+DcSVqUy7OsykGgdupqMmqYYnWwqBVVEnk4QU=
+github.com/spiral/roadrunner/v2 v2.0.0-beta.24 h1:4dl2a4B43wmUZagRHaat6whLtHAhtxbmjukdjHPCLDc=
+github.com/spiral/roadrunner/v2 v2.0.0-beta.24/go.mod h1:AfMRHnrTfvMles/Noz9rLDhjWBwYKcwbTI4JiJa8HwQ=
github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI=
@@ -454,8 +454,8 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
-github.com/temporalio/roadrunner-temporal v1.0.0-beta.4 h1:vetHAz54IUtKR+1YdpOtvSwsZMjIxLy2YelqGE/8wzY=
-github.com/temporalio/roadrunner-temporal v1.0.0-beta.4/go.mod h1:07BoDBckJwoON4fWYFqBxEsP2VbhgXM22bWd7DlMu0M=
+github.com/temporalio/roadrunner-temporal v1.0.0-beta.5 h1:qZ1sgh0K3JOF7UWCqc1LkNXs2YCEkfEYNJcsopvwL5Q=
+github.com/temporalio/roadrunner-temporal v1.0.0-beta.5/go.mod h1:WGg1VcMWZagcIt789L1MBIheL228RDvXK0xcFMVJnAo=
github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
github.com/uber-go/tally v3.3.17+incompatible h1:nFHIuW3VQ22wItiE9kPXic8dEgExWOsVOHwpmoIvsMw=
@@ -480,7 +480,7 @@ github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q
github.com/yookoala/gofast v0.4.0/go.mod h1:rfbkoKaQG1bnuTUZcmV3vAlnfpF4FTq8WbQJf2vcpg8=
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/gopher-lua v0.0.0-20191220021717-ab39c6098bdb/go.mod h1:gqRgreBUhTSL0GeU64rtZ3Uq3wtjOa/TB2YfrtkCbVQ=
+github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da/go.mod h1:E1AXubJBdNmFERAOucpDIxNzeGfLzg0mYh+UfMWdChA=
go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0=