Skip to content

Commit

Permalink
Merge pull request #15459 from RocketChat/release-2.1.0
Browse files Browse the repository at this point in the history
Release 2.1.0
  • Loading branch information
sampaiodiego committed Sep 27, 2019
2 parents 92c00dc + e520887 commit c95663d
Show file tree
Hide file tree
Showing 250 changed files with 5,983 additions and 3,522 deletions.
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
2 changes: 1 addition & 1 deletion .docker/Dockerfile.rhel
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7

ENV RC_VERSION 2.0.0
ENV RC_VERSION 2.1.0

MAINTAINER buildmaster@rocket.chat

Expand Down
Loading

0 comments on commit c95663d

Please sign in to comment.