summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Piashchynski <[email protected]>2021-06-05 22:26:10 +0300
committerValery Piashchynski <[email protected]>2021-06-05 22:26:10 +0300
commit908b2893728b812997f2b03244ab9b37d668fe3f (patch)
tree6bf5c4550ddd1db15940fea09fc1a79aa7611543
parent459e29a85fe5c8571920a602ceb8374bbb893f49 (diff)
- Add Windows github actions
- Update tests, fix Windows issues Signed-off-by: Valery Piashchynski <[email protected]>
-rw-r--r--.github/workflows/linux.yml2
-rw-r--r--.github/workflows/windows.yml84
-rw-r--r--README.md11
-rw-r--r--pkg/pubsub/interface.go5
-rw-r--r--tests/plugins/metrics/metrics_test.go2
5 files changed, 96 insertions, 8 deletions
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index a8f97d12..d6801ebd 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -1,4 +1,4 @@
-name: Tests
+name: Linux
on: [ push, pull_request ]
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
new file mode 100644
index 00000000..c0d14419
--- /dev/null
+++ b/.github/workflows/windows.yml
@@ -0,0 +1,84 @@
+name: Windows
+
+on: [ push, pull_request ]
+
+jobs:
+ golang:
+ name: Build (Go ${{ matrix.go }}, PHP ${{ matrix.php }}, OS ${{matrix.os}})
+ runs-on: ${{ matrix.os }}
+ timeout-minutes: 60
+ strategy:
+ fail-fast: true
+ matrix:
+ php: [ "8.0" ]
+ go: [ "1.16" ]
+ os: [ windows-latest ]
+ steps:
+ - name: Set up Go ${{ matrix.go }}
+ uses: actions/setup-go@v2 # action page: <https://github.com/actions/setup-go>
+ with:
+ go-version: ${{ matrix.go }}
+
+ - name: Set up PHP ${{ matrix.php }}
+ uses: shivammathur/setup-php@v2 # action page: <https://github.com/shivammathur/setup-php>
+ with:
+ php-version: ${{ matrix.php }}
+ extensions: sockets
+
+ - name: Check out code
+ uses: actions/checkout@v2
+
+ - name: Get Composer Cache Directory
+ id: composer-cache
+ run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+ - name: Init Composer Cache # Docs: <https://git.io/JfAKn#php---composer>
+ uses: actions/cache@v2
+ with:
+ path: ${{ steps.composer-cache.outputs.dir }}
+ key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('**/composer.json') }}
+ restore-keys: ${{ runner.os }}-composer-
+
+ - name: Install Composer dependencies
+ run: cd tests && composer update --prefer-dist --no-progress --ansi
+
+ - name: Init Go modules Cache # Docs: <https://git.io/JfAKn#go---modules>
+ uses: actions/cache@v2
+ with:
+ path: ~/go/pkg/mod
+ key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+ restore-keys: ${{ runner.os }}-go-
+
+ - name: Install Go dependencies
+ run: go mod download
+
+ - name: Run golang tests on Windows
+ run: |
+ docker-compose -f ./tests/docker-compose.yaml up -d
+ mkdir ./coverage-ci
+ go test -v -race ./pkg/transport/pipe
+ go test -v -race ./pkg/transport/socket
+ go test -v -race ./pkg/pool
+ go test -v -race ./pkg/worker
+ go test -v -race ./pkg/bst
+ go test -v -race ./pkg/worker_watcher
+ go test -v -race ./plugins/http/config
+ go test -v -race ./plugins/websockets/storage
+ go test -v -race ./tests/plugins/http
+ go test -v -race ./tests/plugins/informer
+ go test -v -race ./tests/plugins/reload
+ go test -v -race ./tests/plugins/server
+ go test -v -race ./tests/plugins/service
+ go test -v -race ./tests/plugins/status
+ go test -v -race ./tests/plugins/config
+ go test -v -race ./tests/plugins/gzip
+ go test -v -race ./tests/plugins/headers
+ go test -v -race ./tests/plugins/logger
+ go test -v -race ./tests/plugins/metrics
+ go test -v -race ./tests/plugins/redis
+ go test -v -race ./tests/plugins/resetter
+ go test -v -race ./tests/plugins/rpc
+ go test -v -race ./tests/plugins/kv
+ go test -v -race ./tests/plugins/websockets
+ docker-compose -f ./tests/docker-compose.yaml down
+ cat ./coverage-ci/*.txt > ./coverage-ci/summary.txt
diff --git a/README.md b/README.md
index 1bbc60ab..08580f86 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,8 @@
<p align="center">
<a href="https://packagist.org/packages/spiral/roadrunner"><img src="https://poser.pugx.org/spiral/roadrunner/version"></a>
<a href="https://pkg.go.dev/github.com/spiral/roadrunner/v2?tab=doc"><img src="https://godoc.org/github.com/spiral/roadrunner/v2?status.svg"></a>
- <a href="https://github.com/spiral/roadrunner/actions"><img src="https://github.com/spiral/roadrunner/workflows/Tests/badge.svg" alt=""></a>
+ <a href="https://github.com/spiral/roadrunner/actions"><img src="https://github.com/spiral/roadrunner/workflows/Linux/badge.svg" alt=""></a>
+ <a href="https://github.com/spiral/roadrunner/actions"><img src="https://github.com/spiral/roadrunner/workflows/Windows/badge.svg" alt=""></a>
<a href="https://github.com/spiral/roadrunner/actions"><img src="https://github.com/spiral/roadrunner/workflows/Linters/badge.svg" alt=""></a>
<a href="https://goreportcard.com/report/github.com/spiral/roadrunner"><img src="https://goreportcard.com/badge/github.com/spiral/roadrunner"></a>
<a href="https://scrutinizer-ci.com/g/spiral/roadrunner/?branch=master"><img src="https://scrutinizer-ci.com/g/spiral/roadrunner/badges/quality-score.png"></a>
@@ -18,10 +19,10 @@ RoadRunner is an open-source (MIT licensed) high-performance PHP application ser
It supports running as a service with the ability to extend its functionality on a per-project basis.
RoadRunner includes PSR-7/PSR-17 compatible HTTP and HTTP/2 server and can be used to replace classic Nginx+FPM setup
-with much greater performance and flexibility.
+with much greater performance and flexibility.
<p align="center">
- <a href="https://roadrunner.dev/"><b>Official Website</b></a> |
+ <a href="https://roadrunner.dev/"><b>Official Website</b></a> |
<a href="https://roadrunner.dev/docs"><b>Documentation</b></a> |
<a href="https://github.com/orgs/spiral/projects/2"><b>Release schedule</b></a>
</p>
@@ -37,7 +38,7 @@ Features:
- No external PHP dependencies (64bit version required), drop-in (based on [Goridge](https://github.com/spiral/goridge))
- Load balancer, process manager and task pipeline
- Integrated metrics (Prometheus)
-- [Workflow engine](https://github.com/temporalio/sdk-php) by [Temporal.io](https://temporal.io)
+- [Workflow engine](https://github.com/temporalio/sdk-php) by [Temporal.io](https://temporal.io)
- Works over TCP, UNIX sockets and standard pipes
- Automatic worker replacement and safe PHP process destruction
- Worker create/allocate/destroy timeouts
@@ -64,7 +65,7 @@ $ composer require spiral/roadrunner:v2.0 nyholm/psr7
$ ./vendor/bin/rr get-binary
```
-> For getting roadrunner binary file you can use our docker image: `spiralscout/roadrunner:X.X.X` (more information about
+> For getting roadrunner binary file you can use our docker image: `spiralscout/roadrunner:X.X.X` (more information about
> image and tags can be found [here](https://hub.docker.com/r/spiralscout/roadrunner/))
Configuration can be located in `.rr.yaml`
diff --git a/pkg/pubsub/interface.go b/pkg/pubsub/interface.go
index 2d5d9595..eb65b4b7 100644
--- a/pkg/pubsub/interface.go
+++ b/pkg/pubsub/interface.go
@@ -6,7 +6,10 @@ import "github.com/spiral/roadrunner/v2/pkg/pubsub/message"
This interface is in BETA. It might be changed.
*/
-// PubSub ...
+// PubSub interface designed to implement on any storage type to provide pub-sub abilities
+// Publisher used to receive messages from the PHP app via RPC
+// Subscriber should be implemented to subscribe to a topics and provide a connections list per topic
+// Reader return next message from the channel
type PubSub interface {
Publisher
Subscriber
diff --git a/tests/plugins/metrics/metrics_test.go b/tests/plugins/metrics/metrics_test.go
index 8be567ec..3e2023d4 100644
--- a/tests/plugins/metrics/metrics_test.go
+++ b/tests/plugins/metrics/metrics_test.go
@@ -130,7 +130,7 @@ func TestMetricsIssue571(t *testing.T) {
mockLogger.EXPECT().Debug("worker destructed", "pid", gomock.Any()).AnyTimes()
mockLogger.EXPECT().Debug("worker constructed", "pid", gomock.Any()).AnyTimes()
mockLogger.EXPECT().Debug("Started RPC service", "address", "tcp://127.0.0.1:6001", "services", []string{"metrics"}).MinTimes(1)
- mockLogger.EXPECT().Debug("200 GET http://localhost:56444/", "remote", "127.0.0.1", "elapsed", gomock.Any()).MinTimes(1)
+ mockLogger.EXPECT().Debug("200 GET http://localhost:56444/", "remote", gomock.Any(), "elapsed", gomock.Any()).MinTimes(1)
mockLogger.EXPECT().Info("declaring new metric", "name", "test", "type", gomock.Any(), "namespace", gomock.Any()).MinTimes(1)
mockLogger.EXPECT().Info("metric successfully added", "name", "test", "type", gomock.Any(), "namespace", gomock.Any()).MinTimes(1)
mockLogger.EXPECT().Info("metric successfully added", "name", "test", "labels", []string{}, "value", gomock.Any()).MinTimes(1)