Skip to content
This repository was archived by the owner on Jul 28, 2020. It is now read-only.

Commit de86614

Browse files
committed
update CI
1 parent 14ea630 commit de86614

File tree

3 files changed

+14
-12
lines changed

3 files changed

+14
-12
lines changed

.circleci/config.yml

+7-9
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ tests_steps: &tests_steps
2525
- run:
2626
name: Wait for services
2727
command: docker-compose run watermill ./.circleci/wait-for-services.sh
28-
- run: "echo Running tests with flags: $TEST_FLAGS"
28+
- run: "echo Running tests command: $TEST_COMMAND"
2929
- run:
3030
name: Run tests
31-
command: docker-compose run watermill go test ./... $TEST_FLAGS
31+
command: docker-compose run watermill $TEST_COMMAND
3232
no_output_timeout: 30m
3333

3434
version: 2
@@ -46,32 +46,30 @@ jobs:
4646
- /tmp/mod-cache
4747
tests_full:
4848
<<: *tests_steps
49+
environment:
50+
TEST_COMMAND: "make test"
4951

5052
tests_stress:
5153
<<: *tests_steps
5254
environment:
53-
TEST_FLAGS: "-tags=stress -timeout=30m"
55+
TEST_COMMAND: "make test_stress"
5456

5557
tests_short:
5658
<<: *tests_steps
5759
environment:
58-
TEST_FLAGS: "-short"
60+
TEST_COMMAND: "make test_short"
5961

6062
tests_race:
6163
<<: *tests_steps
6264
environment:
63-
TEST_FLAGS: "-short -race"
65+
TEST_COMMAND: "make test_race"
6466

6567
workflows:
6668
version: 2
6769
build_and_tests:
6870
jobs:
6971
- build
7072
- tests_full:
71-
filters:
72-
branches:
73-
only:
74-
- master
7573
requires:
7674
- build
7775
- tests_stress:

.circleci/docker-compose.override.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ services:
77
- .:/app
88
- .mod-cache:/go/pkg/mod
99
working_dir: /app
10+
11+
network_mode: "host"
12+
1013
environment:
1114
WATERMILL_TEST_KAFKA_BROKERS: localhost:9091,localhost:9092,localhost:9093,localhost:9094,localhost:9095
12-
network_mode: "host"
15+
16+

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ This is Pub/Sub for the [Watermill](https://watermill.io/) project.
88

99
All Pub/Sub implementations can be found in [https://watermill.io/docs/pub-sub-implementations/](https://watermill.io/docs/pub-sub-implementations/).
1010

11-
**Migration to separated Pub/Sub repositories in progress**.
12-
1311
Watermill is a Go library for working efficiently with message streams. It is intended
1412
for building event driven applications, enabling event sourcing, RPC over messages,
1513
sagas and basically whatever else comes to your mind. You can use conventional pub/sub
@@ -19,6 +17,8 @@ Documentation: https://watermill.io/
1917

2018
Getting started guide: https://watermill.io/docs/getting-started/
2119

20+
Issues: https://github.com/ThreeDotsLabs/watermill/issues
21+
2222
## Contributing
2323

2424
All contributions are very much welcome. If you'd like to help with Watermill development,

0 commit comments

Comments
 (0)