Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4926 commits
Select commit Hold shift + click to select a range
207e6b1
[FIX] API to retrive rooms was returning empty objects
rodrigok Feb 15, 2018
6a45ef8
Feb 15, 2018
b63eae7
Merge pull request #9487 from jgtoriginal/chat.reactAPIendPoint
rodrigok Feb 15, 2018
58d744f
fixing conflicts
jgtoriginal Feb 15, 2018
e336ddb
going by single quotes
jgtoriginal Feb 15, 2018
cee2461
default to the user registered if none is passed
jgtoriginal Feb 16, 2018
b3295a5
adding new params requested by @karlprieb
jgtoriginal Feb 16, 2018
556003e
Provide a re-usable wrapper for method calls
mrsimpson Feb 16, 2018
bd68077
Merge branch 'develop' into read-receipts
sampaiodiego Feb 16, 2018
9651d6e
Merge branch 'develop' into hotfix/empty-rooms
engelgabriel Feb 16, 2018
f203b27
get own preferences only
jgtoriginal Feb 16, 2018
bb7567c
Read receipts redesign
sampaiodiego Feb 16, 2018
89d7256
made shield icon configurable
c0dzilla Feb 16, 2018
a01e10d
users search
karlprieb Feb 16, 2018
77698da
Merge branch 'develop' into new-sidebar
karlprieb Feb 16, 2018
0a0bc38
[FIX] DeprecationWarning: prom-client ... when starting Rocket Chat s…
jgtoriginal Feb 16, 2018
1ca598a
new merged icon
karlprieb Feb 16, 2018
bbc492c
used favicon as shield icon
c0dzilla Feb 16, 2018
9adf9fc
adding muteFocusedConversations param on @karlprieb request
jgtoriginal Feb 16, 2018
a53842d
Fix department typo
sampaiodiego Feb 16, 2018
523b379
Fix lead capture depending on Facebook integration
sampaiodiego Feb 16, 2018
d6ce94a
Fix external queue not using pre-selected agent
sampaiodiego Feb 16, 2018
6a17b0e
Merge branch 'develop' into browseChannel
karlprieb Feb 16, 2018
2db5a94
giving a more sensible error message
jgtoriginal Feb 16, 2018
292cb24
Merge branch 'develop' into shield
geekgonecrazy Feb 16, 2018
967d7aa
Add setting to enable global search
rodrigok Feb 12, 2018
9788ad1
sort
karlprieb Feb 16, 2018
5dab240
Merge branch 'develop' into DeprecationWarning
geekgonecrazy Feb 17, 2018
f2caedd
Merge pull request #9687 from RocketChat/global-search
rodrigok Feb 17, 2018
5d0d53d
Move NRR package to inside the project and convert from CoffeeScript
rodrigok Feb 17, 2018
2a8d479
Merge remote-tracking branch 'origin/develop' into issue_976
rodrigok Feb 17, 2018
e36f95d
replacing this.getUserFromParams() for this.userId, due to legit secu…
jgtoriginal Feb 17, 2018
c964116
fixing typo on i18n
jgtoriginal Feb 17, 2018
3132664
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into user…
jgtoriginal Feb 17, 2018
82e9c42
Merge branch 'DeprecationWarning' into userPrefsEndPountRestAPI
jgtoriginal Feb 17, 2018
a9b004c
Code improvements
rodrigok Feb 17, 2018
b2d99d1
Alert by email when an account is approved/activated/deactivated
rodrigok Feb 17, 2018
a62a6ab
Merge pull request #9737 from RocketChat/hotfix/empty-rooms
rodrigok Feb 17, 2018
50e6799
Merge pull request #9747 from jgtoriginal/DeprecationWarning
rodrigok Feb 17, 2018
4a34938
Merge pull request #9746 from c0dzilla/shield
rodrigok Feb 17, 2018
bbdd802
Merge pull request #9750 from RocketChat/livechat-general-fixes
rodrigok Feb 17, 2018
ff319c8
Merge pull request #9298 from HammyHavoc/patch-10
rodrigok Feb 17, 2018
490fa2d
Merge pull request #9424 from xbolshe/develop
rodrigok Feb 17, 2018
99928a1
Merge pull request #8933 from ramrami/internal-hubot-support-room-types
rodrigok Feb 17, 2018
6f13cf9
Merge remote-tracking branch 'origin/develop' into saml-logout
rodrigok Feb 17, 2018
3c42c9b
Merge remote-tracking branch 'origin/develop' into core/#9688-leave-room
rodrigok Feb 17, 2018
60902e8
Merge pull request #9696 from assistify/core/custom-roomtypes-icon
rodrigok Feb 17, 2018
e5f3469
Merge pull request #9676 from anu-007/emoji_preview
rodrigok Feb 17, 2018
5871eb8
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into user…
jgtoriginal Feb 17, 2018
f4619c2
Merge pull request #9697 from assistify/core/#9688-leave-room
rodrigok Feb 19, 2018
05e70d0
Merge pull request #9560 from speedy01/patch-1
rodrigok Feb 19, 2018
a520e90
remove comments and logs
karlprieb Feb 19, 2018
8d6343a
Merge pull request #9527 from assistify/core/#9522-saml-logout
rodrigok Feb 19, 2018
be97a93
Merge branch 'develop' into move-nrr-inside
engelgabriel Feb 19, 2018
bc57366
Fix livechat start when not using registration form
sampaiodiego Feb 19, 2018
23bf81e
ROcket.Chat Apps manage pages, use one promise to ensure no race cond…
graywolf336 Feb 19, 2018
359b92d
change toolbar search
karlprieb Feb 19, 2018
6639cf8
Merge develop into rocketlets
graywolf336 Feb 19, 2018
d0565de
Remove the trailing commas.
graywolf336 Feb 19, 2018
4a69d6e
try to fix isRtl
karlprieb Feb 19, 2018
ea6c7a1
Merge branch 'develop' into new-sidebar
karlprieb Feb 19, 2018
f1bc601
load more channels on scroll
ggazzo Feb 20, 2018
ba87417
fix emoji on sidebar
ggazzo Feb 20, 2018
e95cd28
Merge branch 'develop' into fix-emoji-big
ggazzo Feb 20, 2018
19a8ad6
Feb 20, 2018
d81d1f7
added tests for this endpoint
Feb 20, 2018
88d305f
Merge pull request #9753 from RocketChat/move-nrr-inside
engelgabriel Feb 20, 2018
8fdb51e
Merge branch 'develop' into new-sidebar
engelgabriel Feb 20, 2018
6c35a9f
fix icon sizes
engelgabriel Feb 20, 2018
94efe9a
Merge branch 'new-sidebar' of github.com:RocketChat/Rocket.Chat into …
engelgabriel Feb 20, 2018
66e5626
Fix typo
engelgabriel Feb 20, 2018
be9bb33
init
ggazzo Feb 20, 2018
a2d9910
added timer to close
ggazzo Feb 20, 2018
6d63199
lint
ggazzo Feb 20, 2018
5a00c47
large modifier
ggazzo Feb 20, 2018
565891e
large texts
ggazzo Feb 20, 2018
f5107e9
Merge branch 'develop' into alerts
ggazzo Feb 20, 2018
2747a37
globals
ggazzo Feb 20, 2018
8131db0
Merge remote-tracking branch 'origin/alerts' into alerts
ggazzo Feb 20, 2018
4fe0cac
Merge pull request #9776 from RocketChat/fix-emoji-big
sampaiodiego Feb 20, 2018
dbaf3f0
Merge pull request #9772 from RocketChat/fix-livechat-start-conversat…
sampaiodiego Feb 20, 2018
6f8d3fc
Merge pull request #9772 from RocketChat/fix-livechat-start-conversat…
sampaiodiego Feb 20, 2018
5fcbc41
Merge pull request #9776 from RocketChat/fix-emoji-big
sampaiodiego Feb 20, 2018
4d3aacf
Merge pull request #9750 from RocketChat/livechat-general-fixes
rodrigok Feb 17, 2018
c188c20
Bump version to 0.61.2
sampaiodiego Feb 20, 2018
e5a82fb
Merge branch 'develop' into alerts
ggazzo Feb 20, 2018
9afdb0a
added title
ggazzo Feb 20, 2018
bf7a688
Merge remote-tracking branch 'origin/alerts' into alerts
ggazzo Feb 20, 2018
68ceaf7
fix test about getPreferences endpoint
Feb 20, 2018
d770e41
fix admin sidebar
ggazzo Feb 20, 2018
f3c32d2
anchor alerts
ggazzo Feb 20, 2018
cff389e
Merge pull request #9786 from RocketChat/release-0.61.2
sampaiodiego Feb 20, 2018
01a9123
reverting @engelgabriel commits
karlprieb Feb 20, 2018
3fa23bb
Merge branch 'develop' into new-sidebar
karlprieb Feb 20, 2018
d05a6ca
Improve error handling and change how the languages are loaded
graywolf336 Feb 20, 2018
643ba1d
fix all diego's problems
karlprieb Feb 20, 2018
78de521
fix align
ggazzo Feb 20, 2018
4175895
fix css
karlprieb Feb 20, 2018
1edd432
fix lint
karlprieb Feb 20, 2018
55c4bd1
Merge branch 'develop' into browseChannel
karlprieb Feb 20, 2018
8de37ff
Fix icon sizes
engelgabriel Feb 20, 2018
7afb66e
update Merge_Channels name
karlprieb Feb 20, 2018
30b0a43
Merge pull request #9666 from RocketChat/rocketlets
rodrigok Feb 20, 2018
e899d2d
Merge pull request #7098 from luisfn/issue_976
rodrigok Feb 20, 2018
6e47d51
Merge branch 'develop' into userPrefsEndPountRestAPI
rodrigok Feb 20, 2018
434c522
alert danger color
ggazzo Feb 20, 2018
3a46e45
Merge pull request #9717 from RocketChat/read-receipts
rodrigok Feb 20, 2018
b92f44d
Merge pull request #9662 from RocketChat/fix-close-upload
rodrigok Feb 20, 2018
41bffea
Merge pull request #9608 from RocketChat/new-sidebar
rodrigok Feb 21, 2018
34340ca
Merge pull request #9457 from jgtoriginal/userPrefsEndPountRestAPI
rodrigok Feb 21, 2018
735d60f
onclose and package-lock
ggazzo Feb 21, 2018
8f89222
Merge pull request #9665 from RocketChat/room-info-contextualbar
rodrigok Feb 21, 2018
9504c1e
search
karlprieb Feb 21, 2018
aec345b
Merge branch 'develop' into browseChannel
karlprieb Feb 21, 2018
2ee77ba
enabledirectoryu on sidebar
karlprieb Feb 21, 2018
013f960
Merge pull request #9642 from RocketChat/browseChannel
rodrigok Feb 21, 2018
e92e59b
Merge pull request #9778 from RocketChat/alerts
rodrigok Feb 21, 2018
b81b366
[NEW] Alert for new versions
rodrigok Feb 20, 2018
57db263
Merge pull request #9793 from RocketChat/version-update-check
rodrigok Feb 21, 2018
9046b4c
Merge pull request #9796 from RocketChat/master
rodrigok Feb 21, 2018
19e7946
Bump version to 0.62.0-rc.0
rodrigok Feb 21, 2018
580de2d
Develop fix sync from master
rodrigok Feb 21, 2018
0875a4f
Merge pull request #9797 from RocketChat/develop-fix
rodrigok Feb 21, 2018
23c7eaf
Update bot-config.yml (#9784)
JSzaszvari Feb 21, 2018
9a9f00b
Fix not receiving sound notifications in rooms created by new livechats.
renatobecker Feb 21, 2018
feaee30
fix height in firefox
MartinSchoeler Feb 21, 2018
b1477b9
remove blank line
MartinSchoeler Feb 21, 2018
5a52973
Request mongoDB version in issue template
Feb 21, 2018
647ac1f
dependencies update
engelgabriel Feb 21, 2018
337e9fd
small fix to show custom fields on userinfo
ggazzo Feb 21, 2018
3fff110
Merge pull request #9804 from RocketChat/fix-firefox-height
rodrigok Feb 21, 2018
e49fdaf
Merge pull request #9821 from RocketChat/hotfix-customfields
rodrigok Feb 21, 2018
3780e72
Merge pull request #9811 from RocketChat/deps-update
rodrigok Feb 21, 2018
fcefbc0
Work on getting Rocket.Chat Apps to work on multi-instance rocket.cha…
graywolf336 Feb 21, 2018
e1c6d1a
Merge pull request #9802 from RocketChat/fix-agents-not-receiving-not…
rodrigok Feb 21, 2018
e199c68
Update ISSUE_TEMPLATE.md
engelgabriel Feb 21, 2018
ae0f5f0
Merge pull request #9807 from TwizzyDizzy/develop
engelgabriel Feb 21, 2018
ba8c8d8
Merge pull request #9658 from RocketChat/add-docs-requirement
engelgabriel Feb 21, 2018
d6ad25a
open search using ctrl/cmd + p and ctrl/cmd + k
karlprieb Feb 22, 2018
78e89f7
search bar is now full width
karlprieb Feb 22, 2018
88bea8d
Avatar now open account related options
karlprieb Feb 22, 2018
ca2d08d
Merge pull request #9839 from RocketChat/searchbar-width
rodrigok Feb 22, 2018
1e5450d
Merge pull request #9837 from RocketChat/fix-cmd-p-search
rodrigok Feb 22, 2018
5d41a67
fix tests
karlprieb Feb 22, 2018
e464834
Fix admin/user settings item text
karlprieb Feb 22, 2018
2ef6942
Merge pull request #9843 from RocketChat/avatar-menu
rodrigok Feb 22, 2018
e64aead
Merge branch 'develop' into release-candidate
rodrigok Feb 22, 2018
4e924ca
Bump version to 0.62.0-rc.1
rodrigok Feb 22, 2018
6997a56
Merge branch 'develop' into fix-admin-items
karlprieb Feb 22, 2018
31ead9a
Allow the filesize to be -1 which means unlimited for #9577
graywolf336 Feb 22, 2018
5230b60
change create channel icon
karlprieb Feb 22, 2018
e9e9aab
fix channel icons on safari
karlprieb Feb 22, 2018
9974fd5
Change the streamer to allow for server-to-server emitting without re…
graywolf336 Feb 23, 2018
6899063
Silence the update error message
graywolf336 Feb 23, 2018
caab399
Merge pull request #9858 from RocketChat/silence-the-unwanted-error
sampaiodiego Feb 23, 2018
83e1d38
fix tests
karlprieb Feb 23, 2018
a5a1ad0
Merge pull request #9845 from RocketChat/fix-admin-items
rodrigok Feb 23, 2018
569c34b
Merge pull request #9852 from RocketChat/fix-channel-icon-safari
rodrigok Feb 23, 2018
7472b4e
fix filter paddings and change merge channels to group by type
karlprieb Feb 23, 2018
53be5e9
Merge pull request #9851 from RocketChat/change-create-channel-icon
rodrigok Feb 23, 2018
8e6f672
[Fix] Not Translated Phrases
bernardoetrevisan Feb 23, 2018
6afc663
Merge remote-tracking branch 'origin/develop' into release-candidate
rodrigok Feb 23, 2018
e582267
Bump version to 0.62.0-rc.2
rodrigok Feb 23, 2018
1f9aaab
Install grpc@1.6.6
geekgonecrazy Feb 23, 2018
1de2924
Removed rc-select and replaced rc-select__element with rc-input__elem…
kaiiiiiiiii Feb 24, 2018
51ba9f5
reverses token unmounting order
c0dzilla Feb 24, 2018
acc8503
Merge pull request #9879 from RocketChat/fix/snap-build
rodrigok Feb 24, 2018
0519d7c
Merge branch 'develop' into fix-not-translated-phrases
rodrigok Feb 24, 2018
77facae
Removed max-width from save changes button in user account ui, to mak…
kaiiiiiiiii Feb 24, 2018
40d5f00
Someone forgot to remove that line.
kaiiiiiiiii Feb 24, 2018
f99127a
Update roomList.js
ggazzo Feb 26, 2018
ae01b66
Merge pull request #9897 from RocketChat/fix-lm-subscriptions
rodrigok Feb 26, 2018
4e27983
Use the package value if failure to parse an int happens on fileuploa…
graywolf336 Feb 26, 2018
1f68b76
Merge branch 'develop' into allow-unlimited-file-size_fix-slack-importer
graywolf336 Feb 26, 2018
11e0601
used array.reverse
c0dzilla Feb 26, 2018
9c2899f
Merge branch 'develop' into fix-not-translated-phrases
rodrigok Feb 26, 2018
df8ec68
Merge pull request #9888 from kaiiiiiiiii/remove_hardcoded_max_width_…
rodrigok Feb 26, 2018
a7f05b1
Merge pull request #9889 from kaiiiiiiiii/fix_overlay_in_user_profile…
rodrigok Feb 26, 2018
4cdb12d
Merge pull request #9850 from RocketChat/allow-unlimited-file-size_fi…
rodrigok Feb 26, 2018
04bf4a8
Merge remote-tracking branch 'origin/develop' into fix-not-translated…
bernardoetrevisan Feb 26, 2018
8201339
Merge remote-tracking branch 'origin/fix-not-translated-phrases' into…
bernardoetrevisan Feb 26, 2018
5033cab
Merge pull request #9884 from c0dzilla/parse
rodrigok Feb 26, 2018
4a6c05e
Merge branch 'develop' into fix-not-translated-phrases
bernardoetrevisan Feb 26, 2018
d3d8053
Fix tests
bernardoetrevisan Feb 26, 2018
bcc214d
Merge remote-tracking branch 'origin/fix-not-translated-phrases' into…
bernardoetrevisan Feb 26, 2018
b468b06
Multi-instance servers now support Rocket.Chat Apps and get notified …
graywolf336 Feb 26, 2018
2822ad3
Merge branch 'develop' into apps-multi-instance-enablement
graywolf336 Feb 26, 2018
273cdbc
Merge pull request #9877 from RocketChat/fix-not-translated-phrases
bernardoetrevisan Feb 26, 2018
5ee3b6f
change filter order
karlprieb Feb 26, 2018
6d9a538
fix unread
karlprieb Feb 26, 2018
b0d9e15
Merge pull request #9902 from RocketChat/apps-multi-instance-enablement
rodrigok Feb 26, 2018
3266360
Merge pull request #9905 from RocketChat/fix-sidebar-filter
rodrigok Feb 26, 2018
96fdeb3
Improve link handling for attachments
rodrigok Feb 27, 2018
6e44b9d
Merge remote-tracking branch 'origin/develop' into release-candidate
rodrigok Feb 27, 2018
5b4d9e9
Bump version to 0.62.0-rc.3
rodrigok Feb 27, 2018
5ef20d0
Fix RHCC image path and default to the current namespace. (#9901)
jsm84 Feb 27, 2018
d26ced2
Merge pull request #9883 from kaiiiiiiiii/fix_misplaced_language_drop…
rodrigok Feb 27, 2018
10e276b
Merge pull request #9908 from RocketChat/improve-attachment-links
rodrigok Feb 27, 2018
bf38ed2
fix livechat queue link
karlprieb Feb 27, 2018
611edeb
Directory now list default channel
karlprieb Feb 27, 2018
05b8371
Update fr.i18n.json
sizrar Feb 27, 2018
8950388
Merge pull request #9931 from RocketChat/directory-now-show-default-c…
rodrigok Feb 28, 2018
b288eeb
Merge pull request #9928 from RocketChat/sidebar-livechat-queue-fix
rodrigok Feb 28, 2018
7ce0bae
Merge pull request #9934 from sizrar/patch-1
rodrigok Feb 28, 2018
51bf4bb
Merge remote-tracking branch 'origin/develop' into release-candidate
rodrigok Feb 28, 2018
1cfdd0b
Bump version to 0.62.0
rodrigok Feb 28, 2018
33cf10b
Merge pull request #9935 from RocketChat/release-0.62.0
rodrigok Feb 28, 2018
767b386
fixed crash on ui when there are subscriptions without room
ggazzo Mar 1, 2018
0178404
Update roomList.js
ggazzo Mar 1, 2018
3dc389d
Update roomList.js
rodrigok Mar 2, 2018
33b7084
Update roomList.js
rodrigok Mar 2, 2018
7b71b2a
Update cachedCollection.js
rodrigok Mar 2, 2018
c680b13
Fix two factor authentication login
sampaiodiego Mar 2, 2018
9fa74a0
Bump version to 0.63.0-develop
rodrigok Mar 2, 2018
2bbaa22
Merge pull request #9985 from RocketChat/develop-sync
rodrigok Mar 2, 2018
ae7b611
fix new channel page resize
karlprieb Mar 2, 2018
cb671d5
Merge pull request #9988 from RocketChat/fix-new-channel
sampaiodiego Mar 3, 2018
24b0c95
Merge pull request #9960 from RocketChat/hotfix-subscription-without-…
sampaiodiego Mar 3, 2018
7019ad4
Merge pull request #9982 from RocketChat/fix-two-factor-login
sampaiodiego Mar 3, 2018
ca487a4
[FIX] Delete user without username was removing direct rooms of all u…
rodrigok Mar 2, 2018
784436d
Merge pull request #9986 from RocketChat/hotfix/user-delete-without-u…
sampaiodiego Mar 3, 2018
5040866
Merge the changes from upstream
maabed Mar 5, 2018
018447f
remove .orig files
maabed Mar 5, 2018
f2f5bdc
- Comment out iFrame commands
maabed Mar 5, 2018
74bc309
disable more unused packages, and remove ios platform
maabed Mar 5, 2018
5160ea9
duplicate rocketchat-lib package
maabed Mar 6, 2018
6ee1627
add servers model with minimal IUD operation
maabed Mar 6, 2018
d5a191a
add servers sub
maabed Mar 12, 2018
ed2a8c0
left sidebar for server, not ready
maabed Mar 12, 2018
c24baac
servers pup
maabed Mar 12, 2018
c1b3380
create server method
maabed Mar 12, 2018
0dfaf59
lastopenserver method to help redirect user after login
maabed Mar 12, 2018
5108f54
server observe on client side, not ready
maabed Mar 12, 2018
1559a77
update room, subscription and user pubs to reflect servers updates
maabed Mar 12, 2018
afe9a1f
update room, subscription and users models to reflect servers implemn…
maabed Mar 12, 2018
87f1126
add serverId when create/update/render room
maabed Mar 12, 2018
f32ce21
UI updates and onboarding updates, not ready
maabed Mar 12, 2018
c5a2c05
update subs model to get DMs, DMs pub
maabed Mar 26, 2018
1b932ab
change app name on package.json and app.json
maabed Mar 26, 2018
159ee58
direct rooms pub
maabed Mar 27, 2018
c478f01
fix sending dms
maabed Mar 27, 2018
2fbfbf2
dms now published with rooms pubs
maabed Mar 27, 2018
a6feb16
server dropdown updates
maabed Mar 27, 2018
9024c1c
change rooms order: set DMs at top
maabed Mar 27, 2018
463e844
show DMs on rooms list
maabed Mar 27, 2018
163ea4d
replace channel search with server search
maabed Apr 3, 2018
991b895
DEV-136 replace sort option with user status
maabed Apr 9, 2018
6e4e189
DEV-135 show only channels in selected server
maabed Apr 10, 2018
d022d11
DEV-134 Fix self dms
maabed Apr 12, 2018
07fc619
DEV-106, disable cached collections
maabed Apr 12, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
280 changes: 280 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,280 @@
defaults: &defaults
working_directory: ~/repo

version: 2
jobs:
build:
<<: *defaults
docker:
- image: circleci/node:8

steps:
- checkout

# - restore_cache:
# keys:
# - node-modules-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "package.json" }}

# - restore_cache:
# keys:
# - meteor-{{ checksum ".circleci/config.yml" }}-{{ checksum ".meteor/release" }}

- run:
name: Install Meteor
command: |
# Restore bin from cache
set +e
METEOR_SYMLINK_TARGET=$(readlink ~/.meteor/meteor)
METEOR_TOOL_DIRECTORY=$(dirname "$METEOR_SYMLINK_TARGET")
set -e
LAUNCHER=$HOME/.meteor/$METEOR_TOOL_DIRECTORY/scripts/admin/launch-meteor
if [ -e $LAUNCHER ]
then
echo "Cached Meteor bin found, restoring it"
sudo cp "$LAUNCHER" "/usr/local/bin/meteor"
else
echo "No cached Meteor bin found."
fi

# only install meteor if bin isn't found
command -v meteor >/dev/null 2>&1 || curl https://install.meteor.com | sed s/--progress-bar/-sL/g | /bin/sh

- run:
name: Versions
command: |
npm --versions
node -v
meteor --version
meteor npm --versions
meteor node -v
git version

- run:
name: Meteor npm install
command: |
# rm -rf node_modules
# rm -f package-lock.json
meteor npm install

- run:
name: Lint
command: |
meteor npm run lint
meteor npm run stylelint

- run:
name: Unit Test
command: |
meteor npm run testunit

# - restore_cache:
# keys:
# - meteor-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum ".meteor/versions" }}

# - restore_cache:
# keys:
# - livechat-meteor-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "packages/rocketchat-livechat/app/.meteor/versions" }}

# - restore_cache:
# keys:
# - livechat-node-modules-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "packages/rocketchat-livechat/app/package.json" }}

- run:
name: Build Rocket.Chat
command: |
if [[ $CIRCLE_TAG ]]; then meteor reset; fi
set +e
meteor add rocketchat:lib
set -e
meteor build --server-only --directory /tmp/build-test

- run:
name: Prepare build
command: |
mkdir /tmp/build/
cd /tmp/build-test
tar czf /tmp/build/Rocket.Chat.tar.gz bundle
cd /tmp/build-test/bundle/programs/server
npm install

# - save_cache:
# key: node-modules-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "package.json" }}
# paths:
# - ./node_modules

# - save_cache:
# key: meteor-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum ".meteor/versions" }}
# paths:
# - ./.meteor/local

# - save_cache:
# key: livechat-node-modules-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "packages/rocketchat-livechat/app/package.json" }}
# paths:
# - ./packages/rocketchat-livechat/app/node_modules

# - save_cache:
# key: livechat-meteor-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "packages/rocketchat-livechat/app/.meteor/versions" }}
# paths:
# - ./packages/rocketchat-livechat/app/.meteor/local

# - save_cache:
# key: meteor-{{ checksum ".circleci/config.yml" }}-{{ checksum ".meteor/release" }}
# paths:
# - ~/.meteor

- persist_to_workspace:
root: /tmp/
paths:
- build-test
- build

- store_artifacts:
path: /tmp/build

test-with-oplog:
<<: *defaults
docker:
- image: circleci/node:8-browsers
- image: mongo:3.4
command: [mongod, --nojournal, --noprealloc, --smallfiles, --replSet=rs0]

environment:
TEST_MODE: "true"
MONGO_URL: mongodb://localhost:27017/testwithoplog
MONGO_OPLOG_URL: mongodb://localhost:27017/local

steps:
- attach_workspace:
at: /tmp

- checkout

- run:
name: Install dependencies
command: |
sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A14518585931BC711F9BA15703C6
echo "deb [ arch=amd64 ] http://repo.mongodb.org/apt/ubuntu trusty/mongodb-org/3.4 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-3.4.list
sudo apt-get update
sudo apt-get install -y mongodb-org-shell

- run:
name: Configure Replica Set
command: |
mongo --eval 'rs.initiate({_id:"rs0", members: [{"_id":1, "host":"localhost:27017"}]})'
mongo --eval 'rs.status()'

- run:
name: NPM install
command: |
npm install

- run:
name: Run Tests
command: |
for i in $(seq 1 5); do npm test && s=0 && break || s=$? && sleep 1; done; (exit $s)

- store_artifacts:
path: .screenshots/

test-without-oplog:
<<: *defaults
docker:
- image: circleci/node:8-browsers
- image: circleci/mongo:3.4

environment:
TEST_MODE: "true"
MONGO_URL: mongodb://localhost:27017/testwithoplog

steps:
- attach_workspace:
at: /tmp

- checkout

- run:
name: NPM install
command: |
npm install

- run:
name: Run Tests
command: |
for i in $(seq 1 5); do npm test && s=0 && break || s=$? && sleep 1; done; (exit $s)

- store_artifacts:
path: .screenshots/

deploy:
<<: *defaults
docker:
- image: circleci/node:4.8

steps:
- attach_workspace:
at: /tmp

- checkout

- run:
name: Install AWS cli
command: |
if [[ $CIRCLE_PULL_REQUESTS ]]; then exit 0; fi;

sudo apt-get -y -qq update
sudo apt-get -y -qq install python3.4-dev
curl -O https://bootstrap.pypa.io/get-pip.py
python3.4 get-pip.py --user
export PATH=~/.local/bin:$PATH
pip install awscli --upgrade --user

- run:
name: Publish assets
command: |
if [[ $CIRCLE_PULL_REQUESTS ]]; then exit 0; fi;

export PATH=~/.local/bin:$PATH
export CIRCLE_TAG=${CIRCLE_TAG:=}

source .circleci/setartname.sh
source .circleci/setdeploydir.sh
bash .circleci/setupsig.sh
bash .circleci/namefiles.sh
# echo ".circleci/sandstorm.sh"

aws s3 cp $ROCKET_DEPLOY_DIR/ s3://download.rocket.chat/build/ --recursive

bash .circleci/update-releases.sh
bash .circleci/docker.sh
bash .circleci/snap.sh

workflows:
version: 2
build-and-test:
jobs:
- build:
filters:
tags:
only: /^[0-9]+\.[0-9]+\.[0-9]+(-rc\.[0-9]+)?$/
- test-with-oplog:
requires:
- build
filters:
tags:
only: /^[0-9]+\.[0-9]+\.[0-9]+(-rc\.[0-9]+)?$/
- test-without-oplog:
requires:
- build
filters:
tags:
only: /^[0-9]+\.[0-9]+\.[0-9]+(-rc\.[0-9]+)?$/
- deploy:
requires:
- test-with-oplog
- test-without-oplog
filters:
branches:
only: develop
tags:
only: /^[0-9]+\.[0-9]+\.[0-9]+(-rc\.[0-9]+)?$/

13 changes: 13 additions & 0 deletions .circleci/docker.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/bash
set -euvo pipefail
IFS=$'\n\t'

CURL_URL="https://registry.hub.docker.com/u/rocketchat/rocket.chat/trigger/$DOCKER_TRIGGER_TOKEN/"

if [[ $CIRCLE_TAG ]]; then
CURL_DATA='{"source_type":"Tag","source_name":"'"$CIRCLE_TAG"'"}';
else
CURL_DATA='{"source_type":"Branch","source_name":"'"$CIRCLE_BRANCH"'"}';
fi

curl -H "Content-Type: application/json" --data "$CURL_DATA" -X POST "$CURL_URL"
8 changes: 8 additions & 0 deletions .circleci/namefiles.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/bash
set -euvo pipefail
IFS=$'\n\t'

FILENAME="$ROCKET_DEPLOY_DIR/rocket.chat-$ARTIFACT_NAME.tgz";

ln -s /tmp/build/Rocket.Chat.tar.gz "$FILENAME"
gpg --armor --detach-sign "$FILENAME"
23 changes: 23 additions & 0 deletions .circleci/setartname.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
if [[ $CIRCLE_TAG ]]; then
export ARTIFACT_NAME="$(npm run version --silent)"
else
export ARTIFACT_NAME="$(npm run version --silent).$CIRCLE_BUILD_NUM"
fi

if [[ $CIRCLE_TAG =~ ^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+ ]]; then
SNAP_CHANNEL=candidate
RC_RELEASE=candidate
RC_VERSION=$CIRCLE_TAG
elif [[ $CIRCLE_TAG =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
SNAP_CHANNEL=stable
RC_RELEASE=stable
RC_VERSION=$CIRCLE_TAG
else
SNAP_CHANNEL=edge
RC_RELEASE=develop
RC_VERSION=0.60.0-develop
fi

export SNAP_CHANNEL
export RC_RELEASE
export RC_VERSION
2 changes: 2 additions & 0 deletions .circleci/setdeploydir.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export ROCKET_DEPLOY_DIR="/tmp/deploy"
mkdir -p $ROCKET_DEPLOY_DIR
8 changes: 8 additions & 0 deletions .circleci/setupsig.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/bash
set -euvo pipefail
IFS=$'\n\t'

cp .circleci/sign.key.gpg /tmp
gpg --yes --batch --passphrase=$GPG_PASSWORD /tmp/sign.key.gpg
gpg --allow-secret-key-import --import /tmp/sign.key
rm /tmp/sign.key
Binary file added .circleci/sign.key.gpg
Binary file not shown.
37 changes: 37 additions & 0 deletions .circleci/snap.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#!/bin/bash
set -euvo pipefail
IFS=$'\n\t'

# Add launchpad to known hosts
ssh-keyscan -t rsa -H git.launchpad.net > ~/.ssh/known_hosts

echo "Preparing to trigger a snap release for $SNAP_CHANNEL channel"

cd $PWD/.snapcraft

# We need some meta data so it'll actually commit. This could be useful to have for debugging later.
echo -e "Tag: $CIRCLE_TAG\r\nBranch: $CIRCLE_BRANCH\r\nBuild: $CIRCLE_BUILD_NUM\r\nCommit: $CIRCLE_SHA1" > buildinfo

# Clone launchpad repo for the channel down.
git clone -b $SNAP_CHANNEL git+ssh://rocket.chat.buildmaster@git.launchpad.net/rocket.chat launchpad

# Rarely will change, but just incase we copy it all
cp -r resources buildinfo launchpad/
sed s/#{RC_VERSION}/$RC_VERSION/ snapcraft.yaml > launchpad/snapcraft.yaml

cd launchpad
git add resources snapcraft.yaml buildinfo

# Set commit author details
git config user.email "buildmaster@rocket.chat"
git config user.name "CircleCI"

# Another place where basic meta data will live for at a glance info
git commit -m "CircleCI Build: $CIRCLE_BUILD_NUM CircleCI Commit: $CIRCLE_SHA1"

# Push up up to the branch of choice.
git push origin $SNAP_CHANNEL

# Clean up
cd ..
rm -rf launchpad
7 changes: 7 additions & 0 deletions .circleci/update-releases.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/bash
set -euvo pipefail
IFS=$'\n\t'

curl -X POST \
-H "X-Update-Token: ${UPDATE_TOKEN}" \
https://releases.rocket.chat/update
Loading