Skip to content

Commit 81f5c15

Browse files
committed
Merge remote-tracking branch 'origin' into feature/899
2 parents 81af8bf + 60d0968 commit 81f5c15

251 files changed

Lines changed: 3082 additions & 1228 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.circleci/config.yml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ jobs:
1414
# CircleCI maintains a library of pre-built images
1515
# documented at https://circleci.com/docs/2.0/circleci-images/
1616
- image: circleci/mysql:5.7
17+
environment:
18+
- MYSQL_ROOT_PASSWORD: P4ssW0rd1!
19+
- MYSQL_DATABASE: circle_test
1720

1821
# Add support for Microsoft SQL Server Testing
1922
- image: microsoft/mssql-server-linux:2017-GA
@@ -128,6 +131,7 @@ jobs:
128131
command: "./vendor/bin/phpunit -d memory_limit=-1 --coverage-html coverage"
129132
environment:
130133
DB_DATABASE: "circle_test"
134+
DB_PASSWORD: "P4ssW0rd1!"
131135
DB_USERNAME: "root"
132136
RUN_MSSQL_TESTS: "true"
133137
MSSQL_HOST: "127.0.0.1"
@@ -168,9 +172,11 @@ jobs:
168172
echo "SAUCELABS_ACCESS_KEY=${SAUCELABS_ACCESS_KEY}" >> .env
169173
# Put in configuration file for Braoodcaster
170174
echo "BROADCAST_DRIVER=redis" >> .env
171-
echo "BROADCASTER_HOST=https://" >> .env
175+
echo "BROADCASTER_HOST=%%BROADCASTER_HOST%%" >> .env
172176
echo "BROADCASTER_KEY=21a795019957dde6bcd96142e05d4b10" >> .env
173-
177+
echo "REDIS_PORT=%%REDISPORT%%" >> .env
178+
echo "BPM_SCRIPTS_HOME=/home/circleci/tmp" >> .env
179+
174180
# Generate unique app key
175181
php artisan key:generate --force
176182
# Copy over our test oauth keys. Regular install will create new ones
@@ -202,7 +208,7 @@ jobs:
202208
ssh -o "ProxyCommand ssh buildbot.processmaker.net -A -W %h:%p" qa-pm4builds "rm -Rf ~/builds/$BUILD_NAME/public/storage"
203209
ssh -o "ProxyCommand ssh buildbot.processmaker.net -A -W %h:%p" qa-pm4builds "php ~/builds/$BUILD_NAME/artisan storage:link"
204210
echo "Deployed to https://${BUILD_NAME}.bpm4.qa.processmaker.net/"
205-
# Run containerDeploy.sh script to spin up Redis docker container, laravel-echo-server, and horizon
211+
# Run containerDeploy.sh script to spin up Redis docker container, laravel-echo-server, and horizon. Excluding QUEUE for now.
206212
ssh -o "ProxyCommand ssh buildbot.processmaker.net -A -W %h:%p" qa-pm4builds "sudo /bin/bash /root/cloudops/containerDeploy.sh $BUILD_NAME"
207213
# Generate Passport Keys
208214
ssh -o "ProxyCommand ssh buildbot.processmaker.net -A -W %h:%p" qa-pm4builds "cd ~/builds/$BUILD_NAME && php artisan passport:keys"

‎.circleci/laravel-echo-server.json‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{
2+
"authHost": "%%AUTHHOST%%",
3+
"authEndpoint": "/broadcasting/auth",
4+
"clients": [],
5+
"database": "redis",
6+
"databaseConfig": {
7+
"redis": {
8+
"port": "%%REDISPORT%%"
9+
},
10+
"sqlite": {
11+
"databasePath": "/database/laravel-echo-server.sqlite"
12+
}
13+
},
14+
"devMode": true,
15+
"host": null,
16+
"port": "%%ECHOPORT%%",
17+
"protocol": "http",
18+
"socketio": {},
19+
"subscribers": {
20+
"http": true,
21+
"redis": true
22+
},
23+
"apiOriginAllow": {
24+
"allowCors": false,
25+
"allowOrigin": "",
26+
"allowMethods": "",
27+
"allowHeaders": ""
28+
}
29+
}
397 Bytes
49.5 KB
515 Bytes
14.1 KB
11.4 KB
19.4 KB
6.85 KB
6.75 KB

0 commit comments

Comments
 (0)