Merge pull request #17875 from RocketChat/release-3.3.3

Release 3.3.3
RocketChat · Jun 11, 2020 · f9553e4 · f9553e4
2 parents a089803 + 34fdf5c
commit f9553e4
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 7 deletions.
diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 3.3.2
+ENV RC_VERSION 3.3.3
 
 MAINTAINER buildmaster@rocket.chat
 

diff --git a/.github/history.json b/.github/history.json
@@ -45141,6 +45141,25 @@
           ]
         }
       ]
+    },
+    "3.3.3": {
+      "node_version": "12.16.1",
+      "npm_version": "6.14.0",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "17874",
+          "title": "Always initialize CIRCLE_BRANCH env var on CI",
+          "userLogin": "sampaiodiego",
+          "contributors": [
+            "sampaiodiego"
+          ]
+        }
+      ]
     }
   }
 }
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -375,11 +375,12 @@ jobs:
       run: |
         if [[ '${{ github.event_name }}' = 'release' ]]; then
           export CIRCLE_TAG="${GITHUB_REF#*tags/}"
+          export CIRCLE_BRANCH=""
         else
+          export CIRCLE_TAG=""
           export CIRCLE_BRANCH="${GITHUB_REF#*heads/}"
         fi;
 
-        export CIRCLE_TAG=${CIRCLE_TAG:=}
         export CIRCLE_SHA1=$GITHUB_SHA
         export CIRCLE_BUILD_NUM=$GITHUB_SHA
 

diff --git a/.snapcraft/resources/prepareRocketChat b/.snapcraft/resources/prepareRocketChat
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-curl -SLf "https://releases.rocket.chat/3.3.2/download/" -o rocket.chat.tgz
+curl -SLf "https://releases.rocket.chat/3.3.3/download/" -o rocket.chat.tgz
 
 tar xf rocket.chat.tgz --strip 1
 

diff --git a/.snapcraft/snap/snapcraft.yaml b/.snapcraft/snap/snapcraft.yaml
@@ -7,7 +7,7 @@
 # 5.  `snapcraft snap`
 
 name: rocketchat-server
-version: 3.3.2
+version: 3.3.3
 summary: Rocket.Chat server
 description: Have your own Slack like online chat, built with Meteor. https://rocket.chat/
 confinement: strict

diff --git a/HISTORY.md b/HISTORY.md
@@ -1,4 +1,24 @@
 
+# 3.3.3
+`2020-06-11  ·  1 🔍  ·  1 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `12.16.1`
+- NPM: `6.14.0`
+- MongoDB: `3.4, 3.6, 4.0`
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+
+- Always initialize CIRCLE_BRANCH env var on CI ([#17874](https://github.com/RocketChat/Rocket.Chat/pull/17874))
+
+</details>
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 3.3.2
 `2020-06-10  ·  2 🔍  ·  1 👩‍💻👨‍💻`
 

diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "3.3.2"
+	"version": "3.3.3"
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "3.3.2",
+	"version": "3.3.3",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"