Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ test-save-npm-cache: &test-save-npm-cache
- ./node_modules

test-docker-image: &test-docker-image
circleci/node:8.11-stretch-browsers
circleci/node:8.15-stretch-browsers

test-with-oplog: &test-with-oplog
<<: *defaults
Expand All @@ -68,7 +68,7 @@ jobs:
build:
<<: *defaults
docker:
- image: circleci/node:8.11-stretch
- image: circleci/node:8.15-stretch
- image: mongo:3.4

steps:
Expand Down Expand Up @@ -133,6 +133,16 @@ jobs:
keys:
- meteor-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum ".meteor/versions" }}

# To reduce memory need during actual build, build the packages solely first
- run:
name: Build a Meteor cache
command: |
# to do this we can clear the main files and it build the rest
echo "" > server/main.js
echo "" > client/main.js
meteor build --server-only --debug --directory /tmp/build-temp
git checkout -- server/main.js client/main.js

- run:
name: Build Rocket.Chat
environment:
Expand Down Expand Up @@ -208,7 +218,7 @@ jobs:
deploy:
<<: *defaults
docker:
- image: circleci/node:8.11-stretch
- image: circleci/node:8.15-stretch

steps:
- attach_workspace:
Expand Down Expand Up @@ -322,7 +332,7 @@ jobs:
pr-build:
<<: *defaults
docker:
- image: circleci/node:8.11-stretch
- image: circleci/node:8.15-stretch

steps:
- checkout
Expand Down
35 changes: 17 additions & 18 deletions .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -15,32 +15,31 @@ blaze-html-templates
[email protected]
[email protected]
[email protected]
[email protected].0
[email protected].1
[email protected]
[email protected]
[email protected]
[email protected]
[email protected].1
[email protected].2
[email protected]
[email protected]
[email protected]
[email protected]
[email protected].0
[email protected].2
[email protected]
[email protected]
reactive-dict@1.2.1
reactive-dict@1.3.0
[email protected]
reload@1.2.0
reload@1.3.0
[email protected]
[email protected]
[email protected]
spacebars
[email protected].0
[email protected].1
[email protected]

#rocketchat:google-natural-language
rocketchat:livechat
rocketchat:monitoring
rocketchat:streamer
rocketchat:version

Expand Down Expand Up @@ -78,22 +77,22 @@ littledata:synced-cron

edgee:slingshot
jalik:[email protected]
accounts-base
accounts-oauth
autoupdate
babel-compiler
google-oauth
accounts-base@1.4.3
accounts-oauth@1.1.16
autoupdate@1.6.0
babel-compiler@7.3.4
google-oauth@1.2.6
htmljs
less
matb33:collection-hooks
meteorhacks:inject-initial
oauth
oauth2
oauth@1.2.8
oauth2@1.2.1
raix:eventemitter
routepolicy
sha
routepolicy@1.1.0
sha@1.0.9
templating
webapp
webapp-hashing
webapp@1.7.3
webapp-hashing@1.0.9
rocketchat:oauth2-server
rocketchat:i18n
2 changes: 1 addition & 1 deletion .meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[email protected].0.2
[email protected].1
46 changes: 22 additions & 24 deletions .meteor/versions
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
[email protected].3
[email protected].4
[email protected]
[email protected]
[email protected].2
[email protected].3
[email protected]
[email protected]
[email protected]
[email protected]
aldeed:[email protected]
[email protected]
autoupdate@1.5.0
babel-compiler@7.2.4
autoupdate@1.6.0
babel-compiler@7.3.4
[email protected]
[email protected].11
[email protected].12
[email protected]
[email protected]
[email protected]
Expand All @@ -28,23 +28,23 @@ [email protected]
[email protected]
[email protected]
[email protected]
ddp-server@2.2.0
ddp-server@2.3.0
deepwell:[email protected]
[email protected]
[email protected]
dispatch:[email protected]
[email protected]
[email protected].4
[email protected].7
[email protected]
[email protected]
[email protected]
edgee:[email protected]
[email protected]
[email protected]
[email protected]
facebook-oauth@1.5.0
facebook-oauth@1.6.0
[email protected]
[email protected].0
[email protected].1
[email protected]
[email protected]
[email protected]
Expand Down Expand Up @@ -78,24 +78,23 @@ [email protected]
[email protected]
matb33:[email protected]
mdg:[email protected]
[email protected].2
[email protected].3
[email protected]
[email protected]
meteorhacks:[email protected]
meteorhacks:[email protected]
meteorspark:[email protected]
[email protected].1
[email protected].0
[email protected].2
[email protected].1
[email protected]
mizzao:[email protected]
mizzao:[email protected]
[email protected]
[email protected]
[email protected].3
[email protected].4
[email protected]
[email protected]
[email protected].0
[email protected].0
[email protected].3
[email protected].1
[email protected]
[email protected]
[email protected]
Expand All @@ -104,13 +103,13 @@ mystor:[email protected]
nimble:[email protected]
nooitaf:[email protected]_1
[email protected]
[email protected].1
[email protected].7
[email protected].2
[email protected].8
[email protected]
[email protected]
[email protected]
[email protected]
ostrio:cookies@2.3.0
ostrio:cookies@2.4.0
pauli:[email protected]
pauli:[email protected]
[email protected]
Expand All @@ -120,14 +119,13 @@ raix:[email protected]
raix:[email protected]
[email protected]
[email protected]
reactive-dict@1.2.1
reactive-dict@1.3.0
[email protected]
reload@1.2.0
reload@1.3.0
[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]_3
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
Expand All @@ -143,7 +141,7 @@ [email protected]
[email protected]
[email protected]
[email protected]
[email protected].0
[email protected].1
[email protected]
[email protected]
[email protected]
Expand All @@ -155,5 +153,5 @@ [email protected]
[email protected]
[email protected]
[email protected]
[email protected].2
[email protected].4
[email protected]
2 changes: 1 addition & 1 deletion .snapcraft/resources/preparenode
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

node_version="v8.11.3"
node_version="v8.15.1"

unamem="$(uname -m)"
if [[ $unamem == *aarch64* ]]; then
Expand Down
2 changes: 1 addition & 1 deletion app/assets/server/assets.js
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ WebApp.connectHandlers.use('/assets/', Meteor.bindEnvironment(function(req, res,
if (defaultUrl) {
const assetUrl = format && ['png', 'svg'].includes(format) ? defaultUrl.replace(/(svg|png)$/, format) : defaultUrl;
req.url = `/${ assetUrl }`;
WebAppInternals.staticFilesMiddleware(WebAppInternals.staticFiles, req, res, next);
WebAppInternals.staticFilesMiddleware(WebAppInternals.staticFilesByArch, req, res, next);
} else {
res.writeHead(404);
res.end();
Expand Down
Loading