Skip to content

Commit 58c4e0a

Browse files
author
auterium
committed
Merge branch 'develop' into feature/teams
2 parents 7a0e697 + c4c0f67 commit 58c4e0a

File tree

18 files changed

+567
-436
lines changed

18 files changed

+567
-436
lines changed

‎.circleci/config.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
build:
77
<<: *defaults
88
docker:
9-
- image: circleci/node:8
9+
- image: circleci/node:8.9
1010

1111
steps:
1212
- checkout
@@ -134,7 +134,7 @@ jobs:
134134
test-with-oplog:
135135
<<: *defaults
136136
docker:
137-
- image: circleci/node:8-browsers
137+
- image: circleci/node:8.9-browsers
138138
- image: mongo:3.4
139139
command: [mongod, --nojournal, --noprealloc, --smallfiles, --replSet=rs0]
140140

@@ -179,7 +179,7 @@ jobs:
179179
test-without-oplog:
180180
<<: *defaults
181181
docker:
182-
- image: circleci/node:8-browsers
182+
- image: circleci/node:8.9-browsers
183183
- image: circleci/mongo:3.4
184184

185185
environment:
@@ -208,7 +208,7 @@ jobs:
208208
deploy:
209209
<<: *defaults
210210
docker:
211-
- image: circleci/node:8
211+
- image: circleci/node:8.9
212212

213213
steps:
214214
- attach_workspace:
@@ -247,6 +247,7 @@ jobs:
247247
bash .circleci/update-releases.sh
248248
bash .circleci/docker.sh
249249
bash .circleci/snap.sh
250+
bash .circleci/redhat-registry.sh
250251
251252
workflows:
252253
version: 2

‎.circleci/redhat-registry.sh‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/bash
2+
set -euvo pipefail
3+
IFS=$'\n\t'
4+
5+
if [[ $CIRCLE_TAG ]]; then
6+
curl -X POST \
7+
https://connect.redhat.com/api/v2/projects/$REDHAT_REGISTRY_PID/build \
8+
-H "Authorization: Bearer $REDHAT_REGISTRY_KEY" \
9+
-H 'Cache-Control: no-cache' \
10+
-H 'Content-Type: application/json' \
11+
-d '{"tag":"'$CIRCLE_TAG'"}'
12+
fi

‎.docker/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM rocketchat/base:8
22

3-
ENV RC_VERSION 0.63.1
3+
ENV RC_VERSION 0.64.0-develop
44

55
MAINTAINER [email protected]
66

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
<!-- [FIX] For bug fixes -->
44
<!-- [BREAK] For pull requests including breaking changes -->
55

6-
<!-- INSTRUCTION: Keep the line below to notify all core developers about this new PR -->
7-
@RocketChat/core
8-
96
<!-- INSTRUCTION: Inform the issue number that this PR closes, or remove the line below -->
107
Closes #ISSUE_NUMBER
118

‎.github/bot-config.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,14 @@ whitelist:
66
- theorenck
77
- JSzaszvari
88
labels:
9+
- "Contributions: welcome"
10+
- "Contributions: only core team"
11+
- "Feature: Request"
12+
- "Feature: Planned"
13+
- "type: bug"
14+
- "help wanted"
915
- duplicate
1016
- enhancement
11-
- "help wanted"
1217
- invalid
1318
- question
1419
- wontfix

‎.github/issue-templates/release.md‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# Release {version}
2+
We are releasing a new version, this issue will keep track of the progress between the first release candidate (20th of each month) to the final release (27th of each month).
3+
4+
After the 20th of each month we start the release process that ends 7 days after, during that period we enter a Feature Freeze. While in the Feature Freeze, we will only be merging bug fixes and not new features.
5+
6+
For any regression, open a new issue and link to this one.
7+
8+
9+
## Before Release - Preparation - 1 business day before the day 20th
10+
- [x] Create the issue to track the release progress
11+
- [ ] Define the highlights from release PRs as suggestion to be included on Blog Post
12+
- [ ] Talk to the Marketing Team about the Blog Post release
13+
- [ ] Talk to the Documentation Team about the Docs release
14+
- [ ] Sync translations from [LingoHub](https://translate.lingohub.com/rocketchat/rocket-dot-chat/dashboard)
15+
16+
## Release Candidate 1 - On the 20th
17+
- [ ] Delete branch `release-candidate`
18+
- [ ] Create branch `release-candidate` based on `develop`
19+
- [ ] On branch `release-candidate` run `npm run release` and follow the steps
20+
- [ ] Publish the branch and the generated tag
21+
- [ ] Edit the tag on GitHub and paste the generated History removing the version from the first line and mark the checkbox **This is a pre-release**
22+
- [ ] Ensure the build is passing on CircleCI
23+
- [ ] Ensure the build is passing on Docker Hub
24+
25+
<!-- Copy following block for next release candidates
26+
## Release Candidate {release-candidate-version}
27+
- [ ] Merge `develop` into `release-candidate` branch
28+
- [ ] On branch `release-candidate` run `npm run release` and follow the steps
29+
- [ ] Publish the branch and the generated tag
30+
- [ ] Edit the tag on GitHub and paste the generated History removing the version from the first line and mark the checkbox **This is a pre-release**
31+
- [ ] Ensure the build is passing on CircleCI
32+
- [ ] Ensure the build is passing on Docker Hub
33+
-->
34+
35+
## Final Release - On the 27th
36+
- [ ] Merge `develop` into `release-candidate` branch
37+
- [ ] Create a new branch `release-{version}` based on `release-candidate`
38+
- [ ] On branch `release-{version}` run `npm run release` and follow the steps **TODO: fix the history**
39+
- [ ] Publish only the branch
40+
- [ ] **Draft a new release** on GitHub
41+
- [ ] Enter tag version as {version}
42+
- [ ] Select target **master**
43+
- [ ] Enter release title as {version}
44+
- [ ] Paste the history removing the version from the first line
45+
- [ ] Save as **draft**
46+
- [ ] Create a PR from the branch `release-{version}` with the same history from the tag/release
47+
- [ ] Ensure the build is passing on CircleCI
48+
- [ ] Ensure the build is passing on Docker Hub
49+
- [ ] When build is passing ask for approval
50+
- [ ] When approved merge it!
51+
- [ ] When merged edit the release/tag and publish it
52+
53+
## After Release - Conclusion - 1 business day after the 27th
54+
- [ ] Check if related issues was closed
55+
- [ ] Check if related issues was assigned to the correct milestone
56+
- [ ] Check with the Marketing Team about the Blog Post release
57+
- [ ] Check with the Documentation Team about the Docs release
58+
- [ ] Create a Sync PR to merge back master to develop
59+
- [ ] Merge Sync PR

‎.openshift/rocket-chat-ephemeral.json‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@
151151
"name": "rocketchat"
152152
},
153153
"spec": {
154-
"dockerImageRepository": "registry.connect.redhat.com/rocketchat/rocketchat",
154+
"dockerImageRepository": "${ROCKETCHAT_IMAGE}",
155155
"tags": [
156156
{
157157
"name": "latest",
@@ -241,7 +241,7 @@
241241
"containers": [
242242
{
243243
"name": "rocketchat",
244-
"image": "registry.connect.redhat.com/rocketchat/rocketchat:latest",
244+
"image": "${ROCKETCHAT_IMAGE}:latest",
245245
"ports": [
246246
{
247247
"containerPort": 3000,
@@ -424,6 +424,13 @@
424424
"value": "rocketchatdb",
425425
"required": true
426426
},
427+
{
428+
"name": "ROCKETCHAT_IMAGE",
429+
"displayName": "RocketChat Image",
430+
"description": "The RocketChat image to use for this deployment",
431+
"required": true,
432+
"value": "rocketchat/rocket.chat"
433+
},
427434
{
428435
"name": "MONGODB_ADMIN_PASSWORD",
429436
"displayName": "MongoDB Admin Password",

‎.openshift/rocket-chat-persistent.json‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
"name": "rocketchat"
172172
},
173173
"spec": {
174-
"dockerImageRepository": "registry.connect.redhat.com/rocketchat/rocketchat",
174+
"dockerImageRepository": "${ROCKETCHAT_IMAGE}",
175175
"tags": [
176176
{
177177
"name": "latest",
@@ -261,7 +261,7 @@
261261
"containers": [
262262
{
263263
"name": "rocketchat",
264-
"image": "registry.connect.redhat.com/rocketchat/rocketchat:latest",
264+
"image": "${ROCKETCHAT_IMAGE}:latest",
265265
"ports": [
266266
{
267267
"containerPort": 3000,
@@ -452,6 +452,13 @@
452452
"from": "[a-zA-Z0-9]{16}",
453453
"required": true
454454
},
455+
{
456+
"name": "ROCKETCHAT_IMAGE",
457+
"displayName": "RocketChat Image",
458+
"description": "The RocketChat image to use for this deployment",
459+
"required": true,
460+
"value": "rocketchat/rocket.chat"
461+
},
455462
{
456463
"name": "VOLUME_CAPACITY",
457464
"displayName": "Volume Capacity",

‎.sandstorm/sandstorm-pkgdef.capnp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = (
2121

2222
appVersion = 62, # Increment this for every release.
2323

24-
appMarketingVersion = (defaultText = "0.63.1"),
24+
appMarketingVersion = (defaultText = "0.64.0-develop"),
2525
# Human-readable representation of appVersion. Should match the way you
2626
# identify versions of your app in documentation and marketing.
2727

‎.snapcraft/snapcraft.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ apps:
1616
rocketchat-server:
1717
command: startRocketChat
1818
daemon: simple
19-
plugs: [network, network-bind]
19+
plugs: [network, network-bind, desktop]
2020
rocketchat-mongo:
2121
command: startmongo
2222
daemon: simple

0 commit comments

Comments
 (0)