Skip to content

Commit

Permalink
Merge branch 'develop' into feat/integrations-script-engine
Browse files Browse the repository at this point in the history
  • Loading branch information
pierre-lehnen-rc authored Sep 22, 2023
2 parents 86f6f54 + 96c268d commit 314c93a
Show file tree
Hide file tree
Showing 165 changed files with 3,685 additions and 1,088 deletions.
5 changes: 5 additions & 0 deletions .changeset/bump-patch-1694741499930.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Bump @rocket.chat/meteor version.
5 changes: 5 additions & 0 deletions .changeset/bump-patch-1694827499043.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Bump @rocket.chat/meteor version.
5 changes: 5 additions & 0 deletions .changeset/bump-patch-1695163548038.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Bump @rocket.chat/meteor version.
5 changes: 5 additions & 0 deletions .changeset/bump-patch-1695165575069.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Bump @rocket.chat/meteor version.
5 changes: 5 additions & 0 deletions .changeset/heavy-zebras-wonder.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Show correct date for last day time
169 changes: 169 additions & 0 deletions .changeset/pre.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,169 @@
{
"mode": "pre",
"tag": "rc",
"initialVersions": {
"@rocket.chat/meteor": "6.4.0-develop",
"rocketchat-services": "1.1.4",
"@rocket.chat/account-service": "0.2.4",
"@rocket.chat/authorization-service": "0.2.4",
"@rocket.chat/ddp-streamer": "0.1.4",
"@rocket.chat/omnichannel-transcript": "0.2.4",
"@rocket.chat/presence-service": "0.2.4",
"@rocket.chat/queue-worker": "0.2.4",
"@rocket.chat/stream-hub-service": "0.2.4",
"@rocket.chat/api-client": "0.1.4",
"@rocket.chat/ddp-client": "0.1.4",
"@rocket.chat/omnichannel-services": "0.0.10",
"@rocket.chat/pdf-worker": "0.0.10",
"@rocket.chat/presence": "0.0.10",
"@rocket.chat/ui-theming": "0.0.1",
"@rocket.chat/account-utils": "0.0.1",
"@rocket.chat/agenda": "0.0.2",
"@rocket.chat/base64": "1.0.12",
"@rocket.chat/cas-validate": "0.0.1",
"@rocket.chat/core-services": "0.1.4",
"@rocket.chat/core-typings": "6.3.4",
"@rocket.chat/cron": "0.0.6",
"@rocket.chat/eslint-config": "0.5.2",
"@rocket.chat/favicon": "0.0.1",
"@rocket.chat/fuselage-ui-kit": "1.0.4",
"@rocket.chat/gazzodown": "1.0.4",
"@rocket.chat/i18n": "0.0.1",
"@rocket.chat/instance-status": "0.0.10",
"@rocket.chat/livechat": "1.13.4",
"@rocket.chat/log-format": "0.0.1",
"@rocket.chat/logger": "0.0.1",
"@rocket.chat/mock-providers": "0.0.1",
"@rocket.chat/model-typings": "0.0.10",
"@rocket.chat/models": "0.0.10",
"@rocket.chat/poplib": "0.0.1",
"@rocket.chat/random": "1.2.1",
"@rocket.chat/release-action": "2.1.0",
"@rocket.chat/rest-typings": "6.3.4",
"@rocket.chat/server-fetch": "0.0.1",
"@rocket.chat/sha256": "1.0.9",
"@rocket.chat/tools": "0.0.1",
"@rocket.chat/ui-client": "1.0.4",
"@rocket.chat/ui-composer": "0.0.1",
"@rocket.chat/ui-contexts": "1.0.4",
"@rocket.chat/ui-video-conf": "1.0.4",
"@rocket.chat/uikit-playground": "0.1.4",
"@rocket.chat/web-ui-registration": "1.0.4"
},
"changesets": [
"blue-ladybugs-raise",
"breezy-bugs-jam",
"bright-carpets-fly",
"bright-snakes-vanish",
"brown-clouds-add",
"bump-patch-1694741499930",
"bump-patch-1694827499043",
"bump-patch-1695163548038",
"bump-patch-1695165575069",
"chilled-flies-fold",
"chilled-phones-give",
"cool-students-tan",
"cuddly-houses-tie",
"cuddly-ties-bake",
"curly-shoes-burn",
"custom-emoji-fs",
"dropdown",
"eighty-kids-jog",
"eleven-icons-tan",
"empty-ants-enjoy",
"fair-cats-destroy",
"fast-pumpkins-smoke",
"fast-yaks-collect",
"fifty-cars-divide",
"fluffy-beds-buy",
"fluffy-lions-rage",
"forty-hotels-pretend",
"four-parents-cheer",
"friendly-glasses-mate",
"fuzzy-glasses-divide",
"fuzzy-schools-brake",
"gold-horses-pretend",
"gold-moose-press",
"good-elephants-live",
"green-adults-peel",
"grumpy-candles-rule",
"heavy-baboons-laugh",
"heavy-cougars-marry",
"heavy-zebras-wonder",
"hip-hounds-ring",
"hip-mugs-promise",
"honest-glasses-roll",
"honest-mirrors-sit",
"honest-numbers-compete",
"importer-progress-bar",
"kind-students-worry",
"lazy-ghosts-design",
"loud-sheep-try",
"lovely-snails-drop",
"lucky-balloons-divide",
"lucky-hounds-sing",
"many-icons-provide",
"mighty-walls-smash",
"moody-comics-cheat",
"moody-pans-act",
"nine-bottles-press",
"nine-carrots-listen",
"odd-elephants-promise",
"old-federation-card",
"perfect-adults-travel",
"pink-zoos-join",
"pretty-bees-give",
"quick-emus-march",
"quiet-phones-sell",
"rare-sheep-yawn",
"real-pets-visit",
"red-windows-admire",
"red-zebras-clap",
"rotten-turtles-agree",
"serious-garlics-clean",
"serious-geckos-drive",
"serious-shrimps-try",
"seven-jobs-tickle",
"shaggy-beans-poke",
"shiny-garlics-carry",
"shiny-tools-worry",
"short-cobras-tell",
"silly-actors-laugh",
"silver-mugs-unite",
"six-buckets-eat",
"slimy-cheetahs-heal",
"slimy-wasps-double",
"slow-lizards-breathe",
"small-rice-repair",
"smooth-planes-cough",
"soft-yaks-matter",
"sour-cows-refuse",
"sour-parrots-nail",
"stale-roses-knock",
"strong-laws-pump",
"swift-birds-build",
"swift-walls-protect",
"tall-pumpkins-cross",
"tame-pens-occur",
"three-ants-give",
"three-birds-tickle",
"tidy-bears-camp",
"tiny-turkeys-burn",
"tough-candles-heal",
"tricky-years-swim",
"unlucky-turtles-search",
"user-mention",
"violet-frogs-cheer",
"warm-hornets-ring",
"wet-frogs-kiss",
"wet-walls-lie",
"wild-spiders-smell",
"wise-onions-trade",
"wise-walls-tan",
"wise-ways-fetch",
"witty-feet-warn",
"yellow-buttons-agree",
"yellow-schools-tell",
"young-trains-glow"
]
}
5 changes: 5 additions & 0 deletions .changeset/strange-papayas-yell.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

fix: Disables GenericMenu without any sections or items
5 changes: 5 additions & 0 deletions .changeset/tall-pumpkins-cross.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/presence": patch
---

Fixed presence broadcast being disabled on server restart
8 changes: 8 additions & 0 deletions .changeset/three-ants-give.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
"@rocket.chat/cron": patch
"@rocket.chat/meteor": patch
---

Increase cron job check delay to 1 min from 5s.

This reduces MongoDB requests introduced on 6.3.
11 changes: 11 additions & 0 deletions .github/workflows/ci-code-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,17 @@ jobs:

- uses: dtinth/setup-github-actions-caching-for-turbo@v1

- name: Cache TypeCheck
uses: actions/cache@v3
if: matrix.check == 'ts'
with:
path: ./apps/meteor/tsconfig.typecheck.tsbuildinfo
key: typecheck-cache-${{ runner.OS }}-${{ hashFiles('yarn.lock') }}-${{ github.event.issue.number }}
restore-keys: |
typecheck-cache-${{ runner.OS }}-${{ hashFiles('yarn.lock') }}
typecheck-cache-${{ runner.OS }}
typecheck-cache
- name: TS TypeCheck
if: matrix.check == 'ts'
run: yarn turbo run typecheck
Expand Down
102 changes: 67 additions & 35 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -356,13 +356,16 @@ jobs:
echo finished
deploy:
name: 🚀 Publish build and update our registry
name: 🚀 Publish build assets
runs-on: ubuntu-20.04
if: github.event_name == 'release' || github.ref == 'refs/heads/develop'
needs: [build-gh-docker, release-versions]

steps:
- uses: actions/checkout@v3
- uses: Bhacaz/checkout-files@v2
with:
files: package.json
branch: ${{ github.ref }}

- name: Restore build
uses: actions/download-artifact@v3
Expand All @@ -376,32 +379,17 @@ jobs:
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_DEFAULT_REGION: 'us-east-1'
GPG_PASSWORD: ${{ secrets.GPG_PASSWORD }}
REDHAT_REGISTRY_PID: ${{ secrets.REDHAT_REGISTRY_PID }}
REDHAT_REGISTRY_KEY: ${{ secrets.REDHAT_REGISTRY_KEY }}
UPDATE_TOKEN: ${{ secrets.UPDATE_TOKEN }}
run: |
REPO_VERSION=$(node -p "require('./package.json').version")
if [[ '${{ github.event_name }}' = 'release' ]]; then
GIT_TAG="${GITHUB_REF#*tags/}"
GIT_BRANCH=""
ARTIFACT_NAME="${REPO_VERSION}"
RC_VERSION=$GIT_TAG
if [[ '${{ needs.release-versions.outputs.release }}' = 'release-candidate' ]]; then
SNAP_CHANNEL=candidate
RC_RELEASE=candidate
elif [[ '${{ needs.release-versions.outputs.release }}' = 'latest' ]]; then
SNAP_CHANNEL=stable
RC_RELEASE=stable
fi
else
GIT_TAG=""
GIT_BRANCH="${GITHUB_REF#*heads/}"
ARTIFACT_NAME="${REPO_VERSION}.$GITHUB_SHA"
RC_VERSION="${REPO_VERSION}"
SNAP_CHANNEL=edge
RC_RELEASE=develop
fi;
ROCKET_DEPLOY_DIR="/tmp/deploy"
FILENAME="$ROCKET_DEPLOY_DIR/rocket.chat-$ARTIFACT_NAME.tgz";
Expand All @@ -419,22 +407,6 @@ jobs:
aws s3 cp $ROCKET_DEPLOY_DIR/ s3://download.rocket.chat/build/ --recursive
curl -H "Content-Type: application/json" -H "X-Update-Token: $UPDATE_TOKEN" -d \
"{\"nodeVersion\": \"${{ needs.release-versions.outputs.node-version }}\", \"compatibleMongoVersions\": [\"4.4\", \"5.0\", \"6.0\"], \"commit\": \"$GITHUB_SHA\", \"tag\": \"$RC_VERSION\", \"branch\": \"$GIT_BRANCH\", \"artifactName\": \"$ARTIFACT_NAME\", \"releaseType\": \"$RC_RELEASE\"}" \
https://releases.rocket.chat/update
# Makes build fail if the release isn't there
curl --fail https://releases.rocket.chat/$RC_VERSION/info
if [[ $GIT_TAG ]]; then
curl -X POST \
https://connect.redhat.com/api/v2/projects/$REDHAT_REGISTRY_PID/build \
-H "Authorization: Bearer $REDHAT_REGISTRY_KEY" \
-H 'Cache-Control: no-cache' \
-H 'Content-Type: application/json' \
-d '{"tag":"'$GIT_TAG'"}'
fi
build-docker-preview:
name: 🚢 Build Docker Image (preview)
runs-on: ubuntu-20.04
Expand Down Expand Up @@ -665,6 +637,66 @@ jobs:
echo "::endgroup::"
notify-services:
name: 🚀 Notify external services
runs-on: ubuntu-20.04
needs:
- services-docker-image-publish
- docker-image-publish
- release-versions
steps:
- uses: Bhacaz/checkout-files@v2
with:
files: package.json
branch: ${{ github.ref }}

- name: Releases service
env:
UPDATE_TOKEN: ${{ secrets.UPDATE_TOKEN }}
run: |
REPO_VERSION=$(node -p "require('./package.json').version")
if [[ '${{ github.event_name }}' = 'release' ]]; then
GIT_TAG="${GITHUB_REF#*tags/}"
GIT_BRANCH=""
ARTIFACT_NAME="${REPO_VERSION}"
RC_VERSION=$GIT_TAG
if [[ '${{ needs.release-versions.outputs.release }}' = 'release-candidate' ]]; then
RC_RELEASE=candidate
elif [[ '${{ needs.release-versions.outputs.release }}' = 'latest' ]]; then
RC_RELEASE=stable
fi
else
GIT_TAG=""
GIT_BRANCH="${GITHUB_REF#*heads/}"
ARTIFACT_NAME="${REPO_VERSION}.$GITHUB_SHA"
RC_VERSION="${REPO_VERSION}"
RC_RELEASE=develop
fi;
curl -H "Content-Type: application/json" -H "X-Update-Token: $UPDATE_TOKEN" -d \
"{\"nodeVersion\": \"${{ needs.release-versions.outputs.node-version }}\", \"compatibleMongoVersions\": [\"4.4\", \"5.0\", \"6.0\"], \"commit\": \"$GITHUB_SHA\", \"tag\": \"$RC_VERSION\", \"branch\": \"$GIT_BRANCH\", \"artifactName\": \"$ARTIFACT_NAME\", \"releaseType\": \"$RC_RELEASE\"}" \
https://releases.rocket.chat/update
# Makes build fail if the release isn't there
curl --fail https://releases.rocket.chat/$RC_VERSION/info
- name: RedHat Registry
if: github.event_name == 'release'
env:
REDHAT_REGISTRY_PID: ${{ secrets.REDHAT_REGISTRY_PID }}
REDHAT_REGISTRY_KEY: ${{ secrets.REDHAT_REGISTRY_KEY }}
run: |
GIT_TAG="${GITHUB_REF#*tags/}"
curl -X POST \
https://connect.redhat.com/api/v2/projects/$REDHAT_REGISTRY_PID/build \
-H "Authorization: Bearer $REDHAT_REGISTRY_KEY" \
-H 'Cache-Control: no-cache' \
-H 'Content-Type: application/json' \
-d '{"tag":"'$GIT_TAG'"}'
trigger-dependent-workflows:
runs-on: ubuntu-latest
if: github.event_name == 'release'
Expand Down
13 changes: 13 additions & 0 deletions .yarn/patches/mongodb-npm-4.17.1-a2fe811ff1.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/mongodb.d.ts b/mongodb.d.ts
index dd080b553309594c28093365ea101adec5c0a20c..20a616de8c97ec68629c01a848ea8df4fe122bf2 100644
--- a/mongodb.d.ts
+++ b/mongodb.d.ts
@@ -5539,7 +5539,7 @@ export declare interface MonitorOptions extends Omit<ConnectionOptions, 'id' | '
* depth any helpers that make use of NestedPaths should devolve to not asserting any
* type safety on the input.
*/
-export declare type NestedPaths<Type, Depth extends number[]> = Depth['length'] extends 8 ? [] : Type extends string | number | boolean | Date | RegExp | Buffer | Uint8Array | ((...args: any[]) => any) | {
+export declare type NestedPaths<Type, Depth extends number[]> = Depth['length'] extends 1 ? [] : Type extends string | number | boolean | Date | RegExp | Buffer | Uint8Array | ((...args: any[]) => any) | {
_bsontype: string;
} ? [] : Type extends ReadonlyArray<infer ArrayType> ? [] | [number, ...NestedPaths<ArrayType, [...Depth, 1]>] : Type extends Map<string, any> ? [string] : Type extends object ? {
[Key in Extract<keyof Type, string>]: Type[Key] extends Type ? [Key] : Type extends Type[Key] ? [Key] : Type[Key] extends ReadonlyArray<infer ArrayType> ? Type extends ArrayType ? [Key] : ArrayType extends Type ? [Key] : [
Loading

0 comments on commit 314c93a

Please sign in to comment.