Skip to content

Commit f34a8e8

Browse files
authored
Replace services/run-services with dist/run-services (#3848)
* treefmt.toml: Remove run-services from excludes of shellcheck It is not a shell script anymore * services/start-services-only.sh: Delete It doesn't do anything and is not referred from any documentation. It has been "deprecated" for quite some time. * Replace services/run-services with dist/run-services
1 parent bc50c95 commit f34a8e8

File tree

9 files changed

+8
-14
lines changed

9 files changed

+8
-14
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,4 +94,4 @@ You have two options:
9494

9595
* Option 1. (recommended) Install wire-server on kubernetes using the configuration and instructions provided in [wire-server-deploy](https://github.com/wireapp/wire-server-deploy). This is the best option to run it on a server and recommended if you want to self-host wire-server.
9696

97-
* Option 2. Compile everything in this repo, then you can use the `services/run-services`. This option is intended as a way to try out wire-server on your local development machine and not suited for production.
97+
* Option 2. Compile everything in this repo, then you can use the `dist/run-services`. This option is intended as a way to try out wire-server on your local development machine and not suited for production.

charts/gundeck/templates/tests/configmap.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ data:
1919
# some gundeck integration tests make use of two different
2020
# cannon instances to test the distributed case. when running
2121
# the integration tests locally, the two instances will be spun
22-
# up separately (see `wire-server/services/run-services`).
22+
# up separately (see `wire-server/dist/run-services`).
2323
#
2424
# here, we spin up two replicas, provide the integration tests
2525
# with the same service coordinates, and rely on the k8s load

docs/src/developer/developer/how-to.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Terminal 1:
1515
* Set up backing services: `./deploy/dockerephemeral/run.sh`
1616

1717
Terminal 2:
18-
* Build and start wire-server services: ` make c && ./services/run-services`
18+
* Build and start wire-server services: ` make c && ./dist/run-services`
1919

2020
Open your browser at:
2121
[http://localhost:8080/api/swagger-ui](http://localhost:8080/api/swagger-ui) for a list of API verions.

hack/bin/cabal-run-integration.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@ run_integration_tests() {
4848
if [[ "$package" = "integration" ]]
4949
then
5050
cd "$TOP_LEVEL"
51-
"$TOP_LEVEL/services/run-services" \
51+
"$TOP_LEVEL/dist/run-services" \
5252
"$TOP_LEVEL/dist/integration" \
5353
"${@:2}"
5454
else
5555
service_dir="$TOP_LEVEL/services/$package"
5656

5757
cd "$service_dir"
58-
"$TOP_LEVEL/services/run-services" \
58+
"$TOP_LEVEL/dist/run-services" \
5959
"$TOP_LEVEL/dist/$package-integration" \
6060
-s "$service_dir/$package.integration.yaml" \
6161
-i "$TOP_LEVEL/services/integration.yaml" \

integration/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ To develop a new test in a fast-loading ghci session:
22

33
1. Run `make cr` to build the whole project and start all services
44
OR run `make cr package=galley` to build galley and start all services
5-
OR run `./services/run-services` to just start all services without rebuilding
5+
OR run `./dist/run-services` to just start all services without rebuilding
66
2.`TEST_INCLUDE=testFederationDomain make devtest` to start a ghcid session that re-runs the test after each successful build of the test suite
77

88
Original design guidelines / goals:

services/spar/test-scim-suite/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ The scripts in this directory allow to run the [SCIM Test Suite](https://github.
44

55
How to run:
66
```sh
7-
./services/run-services
7+
./dist/run-services
88
./services/spar/test-scim-suite/runsuite.sh
99
```
1010

services/start-services-only.sh

Lines changed: 0 additions & 5 deletions
This file was deleted.

tools/stern/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ TODO: This section is under construction
1919

2020
## How to run stern locally
2121

22-
Start local services via `services/run-services`
22+
Start local services via `dist/run-services`
2323

2424
Open <http://localhost:8091> in a browser.
2525

treefmt.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ excludes = [
4040
"services/spar/test-scim-suite/runsuite.sh",
4141
"services/spar/test-scim-suite/run.sh",
4242
"services/brig/federation-tests.sh",
43-
"services/run-services",
4443
"hack/bin/create_test_team_members.sh",
4544
"hack/bin/create_test_team_scim.sh",
4645
"hack/bin/create_test_user.sh",

0 commit comments

Comments
 (0)