diff options
| author | Chocobozzz <me@florianbigard.com> | 2021-05-14 14:18:13 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2021-05-14 14:18:13 +0200 |
| commit | 5b1a6d45b5d6e50102e1c7c8c845401b76b11b4d (patch) | |
| tree | f4d7f184593e6e025b71cbe7cb4ea8583fd267b0 /scripts | |
| parent | aea0b0e7cde7495e60fe07b4444067f53d35ce3f (diff) | |
| parent | cb4bab61c19f2be7858f9cc6e8e234f04b1d504f (diff) | |
| download | PeerTube-5b1a6d45b5d6e50102e1c7c8c845401b76b11b4d.tar.gz PeerTube-5b1a6d45b5d6e50102e1c7c8c845401b76b11b4d.tar.zst PeerTube-5b1a6d45b5d6e50102e1c7c8c845401b76b11b4d.zip | |
Merge branch 'release/3.2.0' into develop
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/e2e/index.sh | 2 | ||||
| -rwxr-xr-x | scripts/e2e/local.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/e2e/index.sh b/scripts/e2e/index.sh index 08f09c9ed..49d57f1df 100755 --- a/scripts/e2e/index.sh +++ b/scripts/e2e/index.sh | |||
| @@ -11,4 +11,4 @@ npm run clean:server:test | |||
| 11 | 11 | ||
| 12 | npm run concurrently -- -k -s first \ | 12 | npm run concurrently -- -k -s first \ |
| 13 | "cd client && npm run ng -- e2e --port 3333" \ | 13 | "cd client && npm run ng -- e2e --port 3333" \ |
| 14 | "NODE_ENV=test NODE_APP_INSTANCE=1 NODE_CONFIG='{ \"log\": { \"level\": \"warning\" }, \"signup\": { \"enabled\": false } }' node dist/server" | 14 | "NODE_ENV=test NODE_APP_INSTANCE=1 NODE_CONFIG='{ \"log\": { \"level\": \"warn\" }, \"signup\": { \"enabled\": false } }' node dist/server" |
diff --git a/scripts/e2e/local.sh b/scripts/e2e/local.sh index 0e74707d8..469f2eb5e 100755 --- a/scripts/e2e/local.sh +++ b/scripts/e2e/local.sh | |||
| @@ -12,4 +12,4 @@ npm run clean:server:test | |||
| 12 | 12 | ||
| 13 | npm run concurrently -- -k -s first \ | 13 | npm run concurrently -- -k -s first \ |
| 14 | "cd client && npm run ng -- e2e --port 3333 -c local" \ | 14 | "cd client && npm run ng -- e2e --port 3333 -c local" \ |
| 15 | "NODE_ENV=test NODE_APP_INSTANCE=1 NODE_CONFIG='{ \"log\": { \"level\": \"warning\" }, \"signup\": { \"enabled\": false } }' node dist/server" | 15 | "NODE_ENV=test NODE_APP_INSTANCE=1 NODE_CONFIG='{ \"log\": { \"level\": \"warn\" }, \"signup\": { \"enabled\": false } }' node dist/server" |