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
2 changes: 1 addition & 1 deletion .docker-mongo/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:12.18.3-buster-slim
FROM node:12.18.4-buster-slim

LABEL maintainer="buildmaster@rocket.chat"

Expand Down
2 changes: 1 addition & 1 deletion .docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:12.18.3-buster-slim
FROM node:12.18.4-buster-slim

LABEL maintainer="buildmaster@rocket.chat"

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ jobs:
echo "github.event_name: ${{ github.event_name }}"
cat $GITHUB_EVENT_PATH

- name: Use Node.js 12.18.3
- name: Use Node.js 12.18.4
uses: actions/setup-node@v1
with:
node-version: "12.18.3"
node-version: "12.18.4"

- uses: actions/checkout@v2

Expand Down Expand Up @@ -175,7 +175,7 @@ jobs:

strategy:
matrix:
node-version: ["12.18.3"]
node-version: ["12.18.4"]
mongodb-version: ["3.4", "3.6", "4.0"]

steps:
Expand Down Expand Up @@ -290,10 +290,10 @@ jobs:
path: ~/.meteor
key: ${{ runner.OS }}-meteor-${{ hashFiles('.meteor/release') }}-${{ hashFiles('.github/workflows/build_and_test.yml') }}

- name: Use Node.js 12.18.3
- name: Use Node.js 12.18.4
uses: actions/setup-node@v1
with:
node-version: "12.18.3"
node-version: "12.18.4"

- name: Install Meteor
run: |
Expand Down
2 changes: 1 addition & 1 deletion .meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
METEOR@1.11
METEOR@1.11.1
6 changes: 3 additions & 3 deletions .meteor/versions
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ binary-heap@1.0.11
blaze@2.3.4
blaze-html-templates@1.1.2
blaze-tools@1.0.10
boilerplate-generator@1.7.0
boilerplate-generator@1.7.1
caching-compiler@1.2.2
caching-html-compiler@1.1.3
callback-hook@1.3.0
Expand Down Expand Up @@ -79,7 +79,7 @@ meteor-base@1.4.0
meteor-developer-oauth@1.2.1
meteorhacks:inject-initial@1.0.4
meteorspark:util@0.2.0
minifier-css@1.5.2
minifier-css@1.5.3
minifier-js@2.6.0
minimongo@1.6.0
mizzao:timesync@0.3.4
Expand All @@ -97,7 +97,7 @@ mystor:device-detection@0.2.0
nimble:restivus@0.8.12
nooitaf:colors@1.1.2_1
npm-bcrypt@0.9.3
npm-mongo@3.8.0
npm-mongo@3.8.1
oauth@1.3.0
oauth1@1.3.0
oauth2@1.3.0
Expand Down
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="v12.18.3"
node_version="v12.18.4"

unamem="$(uname -m)"
if [[ $unamem == *aarch64* ]]; then
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
[![Code Climate](https://codeclimate.com/github/RocketChat/Rocket.Chat/badges/gpa.svg)](https://codeclimate.com/github/RocketChat/Rocket.Chat)
[![MIT License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat)](https://github.com/RocketChat/Rocket.Chat/raw/master/LICENSE)

* [**NEW!** Rocket.Chat Moving to a Single Codebase](#moving-to-a-single-codebase)
* [**NEW!** Rocket.Chat Moving to a Single Codebase](#moving-to-a-single-codebase)
* [Community](#community)
* [Mobile Apps](#mobile-apps)
* [Desktop Apps](#desktop-apps)
Expand Down Expand Up @@ -364,7 +364,7 @@ Prerequisites:
* [Git](http://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
* [Meteor](https://www.meteor.com/install)

> Meteor automatically installs a hidden [NodeJS v12](https://nodejs.org/download/release/v12.16.1/) and [MongoDB v4.2](https://docs.mongodb.com/manual/introduction/) to be used when you run your app in development mode using the `meteor` command.
> Meteor automatically installs a hidden [NodeJS v12](https://nodejs.org/download/release/v12.18.4/) and [MongoDB v4.2](https://docs.mongodb.com/manual/introduction/) to be used when you run your app in development mode using the `meteor` command.

Now just clone and start the app:

Expand Down