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
6 changes: 3 additions & 3 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,12 @@ jobs:
env:
METEOR_PROFILE: 1000
run: |
yarn build -- --debug --directory /tmp/build-test
yarn build:ci -- --debug --directory /tmp/build-test

- name: Build Rocket.Chat
if: startsWith(github.ref, 'refs/pull/') != true
run: |
yarn build --directory /tmp/build-test
yarn build:ci --directory /tmp/build-test

- name: Prepare build
run: |
Expand Down Expand Up @@ -503,7 +503,7 @@ jobs:
# git checkout -- server/main.ts client/main.ts .meteor/packages

- name: Build Rocket.Chat
run: yarn build -- --directory /tmp/build-pr
run: yarn build:ci -- --directory /tmp/build-pr

- name: Build Docker image for PRs
run: |
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ coverage
.next/
out/
build
dist

# misc
.DS_Store
Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
],
"scripts": {
"start": "meteor",
"build": "meteor build --server-only",
"dev": "meteor",
"build:ci": "meteor build --server-only",
"dev": "meteor --exclude-archs \"web.browser.legacy, web.cordova\"",
"ha": "meteor npm run ha:start",
"ha:start": "ts-node .scripts/run-ha.ts main",
"ha:add": "ts-node .scripts/run-ha.ts instance",
Expand Down
93 changes: 47 additions & 46 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,48 +1,49 @@
{
"name": "rocket.chat",
"version": "4.7.0-develop",
"description": "Rocket.Chat Monorepo",
"main": "index.js",
"private": true,
"scripts": {
"postinstall": "husky install",
"build": "turbo run build",
"testunit": "turbo run testunit",
"dev": "turbo run dev --parallel",
"lint": "turbo run lint"
},
"devDependencies": {
"husky": "^7.0.1",
"turbo": "latest"
},
"workspaces": [
"apps/*",
"packages/*"
],
"repository": {
"type": "git",
"url": "git+https://github.com/RocketChat/Rocket.Chat.git"
},
"author": "",
"license": "MIT",
"bugs": {
"url": "https://github.com/RocketChat/Rocket.Chat/issues"
},
"homepage": "https://github.com/RocketChat/Rocket.Chat#readme",
"engines": {
"npm": ">=7.0.0",
"node": ">=14.0.0"
},
"packageManager": "yarn@3.2.0",
"houston": {
"minTag": "0.55.0-rc.0",
"updateFiles": [
"apps/meteor/package.json",
"apps/meteor/package-lock.json",
"apps/meteor/.snapcraft/snap/snapcraft.yaml",
"apps/meteor/.snapcraft/resources/prepareRocketChat",
"apps/meteor/.docker/Dockerfile.rhel",
"apps/meteor/app/utils/rocketchat.info"
]
}
"name": "rocket.chat",
"version": "4.7.0-develop",
"description": "Rocket.Chat Monorepo",
"main": "index.js",
"private": true,
"scripts": {
"postinstall": "husky install",
"build": "turbo run build",
"build:ci": "turbo run build:ci",
"testunit": "turbo run testunit",
"dev": "turbo run dev --parallel",
"lint": "turbo run lint"
},
"devDependencies": {
"husky": "^7.0.1",
"turbo": "latest"
},
"workspaces": [
"apps/*",
"packages/*"
],
"repository": {
"type": "git",
"url": "git+https://github.com/RocketChat/Rocket.Chat.git"
},
"author": "",
"license": "MIT",
"bugs": {
"url": "https://github.com/RocketChat/Rocket.Chat/issues"
},
"homepage": "https://github.com/RocketChat/Rocket.Chat#readme",
"engines": {
"npm": ">=7.0.0",
"node": ">=14.0.0"
},
"packageManager": "yarn@3.2.0",
"houston": {
"minTag": "0.55.0-rc.0",
"updateFiles": [
"apps/meteor/package.json",
"apps/meteor/package-lock.json",
"apps/meteor/.snapcraft/snap/snapcraft.yaml",
"apps/meteor/.snapcraft/resources/prepareRocketChat",
"apps/meteor/.docker/Dockerfile.rhel",
"apps/meteor/app/utils/rocketchat.info"
]
}
}
47 changes: 26 additions & 21 deletions turbo.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,29 @@
{
"$schema": "https://turborepo.org/schema.json",
"pipeline": {
"build": {
"dependsOn": ["^build"],
"outputs": ["dist/**"]
},
"testunit": {
"outputs": []
},
"lint": {
"outputs": []
},
"translation-check": {
"outputs": []
},
"typecheck": {
"outputs": []
},
"dev": {
"cache": false
}
}
"pipeline": {
"build": {
"dependsOn": ["^build"],
"outputs": ["dist/**"]
},
"build:ci": {
"dependsOn": ["build"],
"outputs": ["dist/**"]
},
"testunit": {
"outputs": []
},
"lint": {
"outputs": []
},
"translation-check": {
"outputs": []
},
"typecheck": {
"dependsOn": ["build"],
"outputs": []
},
"dev": {
"cache": false
}
}
}