Skip to content

Commit 0a3b0a9

Browse files
dodaa08dodaa08
authored
Merge branch 'develop' into fix/FileUploadCustomEmoji
2 parents 3f6a0eb + 3c30636 commit 0a3b0a9

File tree

204 files changed

+5583
-5992
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

204 files changed

+5583
-5992
lines changed

‎.github/actions/update-version-durability/package-lock.json‎

Lines changed: 18 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.github/workflows/ci-code-check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- uses: rharkor/caching-for-turbo@v1.8
4545

4646
- name: Restore packages build
47-
uses: actions/download-artifact@v7
47+
uses: actions/download-artifact@v8
4848
with:
4949
name: packages-build
5050
path: /tmp

‎.github/workflows/ci-test-e2e.yml‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
# if building for production on develop branch or release, add suffix for coverage images
7575
DOCKER_TAG_SUFFIX_ROCKETCHAT: ${{ inputs.coverage == matrix.mongodb-version && (github.event_name == 'release' || github.ref == 'refs/heads/develop') && '-cov' || '' }}
7676
MONGODB_VERSION: ${{ matrix.mongodb-version }}
77-
COVERAGE_DIR: '/tmp/coverage/${{ inputs.type }}'
77+
COVERAGE_DIR: '/tmp/coverage/${{ startsWith(inputs.type, ''api'') && ''api'' || inputs.type }}'
7878
COVERAGE_FILE_NAME: '${{ inputs.type }}-${{ matrix.shard }}.json'
7979
COVERAGE_REPORTER: ${{ inputs.coverage == matrix.mongodb-version && 'json' || '' }}
8080

@@ -126,7 +126,7 @@ jobs:
126126
- uses: rharkor/caching-for-turbo@v1.8
127127

128128
- name: Restore packages build
129-
uses: actions/download-artifact@v7
129+
uses: actions/download-artifact@v8
130130
with:
131131
name: packages-build
132132
path: /tmp
@@ -138,7 +138,7 @@ jobs:
138138
139139
# Download Docker images from build artifacts
140140
- name: Download Docker images
141-
uses: actions/download-artifact@v7
141+
uses: actions/download-artifact@v8
142142
if: github.event.pull_request.head.repo.full_name != github.repository && github.event_name != 'release' && github.ref != 'refs/heads/develop'
143143
with:
144144
pattern: ${{ inputs.release == 'ce' && 'docker-image-rocketchat-amd64-coverage' || 'docker-image-*-amd64-coverage' }}
@@ -169,7 +169,7 @@ jobs:
169169
run: echo "DEBUG_LOG_LEVEL=2" >> $GITHUB_ENV
170170

171171
- name: Start httpbin container and wait for it to be ready
172-
if: inputs.type == 'api'
172+
if: inputs.type == 'api' || inputs.type == 'api-livechat'
173173
run: |
174174
docker compose -f docker-compose-ci.yml up -d httpbin
175175
@@ -227,6 +227,22 @@ jobs:
227227
ls -la $COVERAGE_DIR
228228
exit $s
229229
230+
- name: E2E Test API (Livechat)
231+
if: inputs.type == 'api-livechat'
232+
working-directory: ./apps/meteor
233+
env:
234+
WEBHOOK_TEST_URL: 'http://httpbin'
235+
IS_EE: ${{ inputs.release == 'ee' && 'true' || '' }}
236+
run: |
237+
set -o xtrace
238+
239+
npm run testapi:livechat
240+
241+
docker compose -f ../../docker-compose-ci.yml stop
242+
243+
ls -la $COVERAGE_DIR
244+
exit $s
245+
230246
- name: E2E Test UI (${{ matrix.shard }}/${{ inputs.total-shard }})
231247
if: inputs.type == 'ui'
232248
env:

‎.github/workflows/ci-test-storybook.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- uses: rharkor/caching-for-turbo@v1.8
3939

4040
- name: Restore packages build
41-
uses: actions/download-artifact@v7
41+
uses: actions/download-artifact@v8
4242
with:
4343
name: packages-build
4444
path: /tmp

‎.github/workflows/ci-test-unit.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
- uses: rharkor/caching-for-turbo@v1.8
4343

4444
- name: Restore packages build
45-
uses: actions/download-artifact@v7
45+
uses: actions/download-artifact@v8
4646
with:
4747
name: packages-build
4848
path: /tmp

‎.github/workflows/ci.yml‎

Lines changed: 54 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,6 @@ jobs:
253253
- type: ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'production' || '' }}
254254

255255
steps:
256-
257256
- uses: actions/checkout@v6
258257

259258
- uses: ./.github/actions/meteor-build
@@ -298,7 +297,7 @@ jobs:
298297
- uses: actions/checkout@v6
299298

300299
- name: Restore packages build
301-
uses: actions/download-artifact@v7
300+
uses: actions/download-artifact@v8
302301
with:
303302
name: packages-build
304303
path: /tmp
@@ -397,7 +396,7 @@ jobs:
397396

398397
- name: Download manifests
399398
if: github.actor != 'dependabot[bot]' && (github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'release' || github.ref == 'refs/heads/develop')
400-
uses: actions/download-artifact@v7
399+
uses: actions/download-artifact@v8
401400
with:
402401
pattern: manifests-*
403402
path: /tmp/manifests
@@ -511,6 +510,22 @@ jobs:
511510
CR_USER: ${{ secrets.CR_USER }}
512511
CR_PAT: ${{ secrets.CR_PAT }}
513512

513+
test-api-livechat:
514+
name: 🔨 Test API Livechat (CE)
515+
needs: [checks, build-gh-docker-publish, release-versions]
516+
517+
uses: ./.github/workflows/ci-test-e2e.yml
518+
with:
519+
type: api-livechat
520+
release: ce
521+
node-version: ${{ needs.release-versions.outputs.node-version }}
522+
deno-version: ${{ needs.release-versions.outputs.deno-version }}
523+
lowercase-repo: ${{ needs.release-versions.outputs.lowercase-repo }}
524+
gh-docker-tag: ${{ needs.release-versions.outputs.gh-docker-tag }}
525+
secrets:
526+
CR_USER: ${{ secrets.CR_USER }}
527+
CR_PAT: ${{ secrets.CR_PAT }}
528+
514529
test-ui:
515530
name: 🔨 Test UI (CE)
516531
needs: [checks, build-gh-docker-publish, release-versions]
@@ -556,6 +571,26 @@ jobs:
556571
CR_USER: ${{ secrets.CR_USER }}
557572
CR_PAT: ${{ secrets.CR_PAT }}
558573

574+
test-api-livechat-ee:
575+
name: 🔨 Test API Livechat (EE)
576+
needs: [checks, build-gh-docker-publish, release-versions]
577+
578+
uses: ./.github/workflows/ci-test-e2e.yml
579+
with:
580+
type: api-livechat
581+
release: ee
582+
transporter: 'nats://nats:4222'
583+
enterprise-license: ${{ needs.release-versions.outputs.enterprise-license }}
584+
mongodb-version: "['8.0']"
585+
coverage: '8.0'
586+
node-version: ${{ needs.release-versions.outputs.node-version }}
587+
deno-version: ${{ needs.release-versions.outputs.deno-version }}
588+
lowercase-repo: ${{ needs.release-versions.outputs.lowercase-repo }}
589+
gh-docker-tag: ${{ needs.release-versions.outputs.gh-docker-tag }}
590+
secrets:
591+
CR_USER: ${{ secrets.CR_USER }}
592+
CR_PAT: ${{ secrets.CR_PAT }}
593+
559594
test-ui-ee:
560595
name: 🔨 Test UI (EE)
561596
needs: [checks, build-gh-docker-publish, release-versions]
@@ -603,7 +638,7 @@ jobs:
603638
- uses: rharkor/caching-for-turbo@v1.8
604639

605640
- name: Restore turbo build
606-
uses: actions/download-artifact@v7
641+
uses: actions/download-artifact@v8
607642
continue-on-error: true
608643
with:
609644
name: turbo-build
@@ -627,7 +662,7 @@ jobs:
627662
628663
# Download Docker images from build artifacts
629664
- name: Download Docker images
630-
uses: actions/download-artifact@v7
665+
uses: actions/download-artifact@v8
631666
if: github.event.pull_request.head.repo.full_name != github.repository && github.event_name != 'release' && github.ref != 'refs/heads/develop'
632667
with:
633668
pattern: 'docker-image-rocketchat-amd64-coverage'
@@ -682,18 +717,18 @@ jobs:
682717
report-coverage:
683718
name: 📊 Report Coverage
684719
runs-on: ubuntu-24.04
685-
needs: [release-versions, test-api-ee, test-ui-ee]
720+
needs: [release-versions, test-api-ee, test-api-livechat-ee, test-ui-ee]
686721

687722
steps:
688723
- uses: actions/checkout@v6
689724

690725
- name: Use Node.js
691-
uses: actions/setup-node@v6.1.0
726+
uses: actions/setup-node@v6.2.0
692727
with:
693728
node-version: ${{ needs.release-versions.outputs.node-version }}
694729

695730
- name: Restore coverage folder
696-
uses: actions/download-artifact@v7
731+
uses: actions/download-artifact@v8
697732
with:
698733
pattern: coverage-*
699734
path: /tmp/coverage
@@ -734,7 +769,7 @@ jobs:
734769
tests-done:
735770
name: ✅ Tests Done
736771
runs-on: ubuntu-24.04-arm
737-
needs: [checks, test-unit, test-api, test-ui, test-api-ee, test-ui-ee, test-federation-matrix]
772+
needs: [checks, test-unit, test-api, test-ui, test-api-ee, test-ui-ee, test-api-livechat, test-api-livechat-ee, test-federation-matrix]
738773
if: always()
739774
steps:
740775
- name: Test finish aggregation
@@ -763,6 +798,14 @@ jobs:
763798
exit 1
764799
fi
765800
801+
if [[ '${{ needs.test-api-livechat.result }}' != 'success' ]]; then
802+
exit 1
803+
fi
804+
805+
if [[ '${{ needs.test-api-livechat-ee.result }}' != 'success' ]]; then
806+
exit 1
807+
fi
808+
766809
if [[ '${{ needs.test-federation-matrix.result }}' != 'success' ]]; then
767810
exit 1
768811
fi
@@ -784,7 +827,7 @@ jobs:
784827
ref: ${{ github.ref }}
785828

786829
- name: Restore build
787-
uses: actions/download-artifact@v7
830+
uses: actions/download-artifact@v8
788831
with:
789832
name: build-production
790833
path: /tmp/build
@@ -855,7 +898,7 @@ jobs:
855898

856899
- name: Download manifests
857900
if: github.actor != 'dependabot[bot]' && (github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'release' || github.ref == 'refs/heads/develop')
858-
uses: actions/download-artifact@v7
901+
uses: actions/download-artifact@v8
859902
with:
860903
pattern: manifests-*
861904
path: /tmp/manifests

‎.github/workflows/update-version-durability.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- uses: actions/checkout@v6
2222

2323
- name: Use Node.js
24-
uses: actions/setup-node@v6.1.0
24+
uses: actions/setup-node@v6.2.0
2525
with:
2626
node-version: 22.16.0
2727

‎apps/meteor/.mocharc.api.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ module.exports = /** @satisfies {import('mocha').MochaOptions} */ ({
1010
bail: true,
1111
retries: 0,
1212
file: 'tests/end-to-end/teardown.ts',
13-
spec: ['tests/end-to-end/api/**/*', 'tests/end-to-end/apps/*'],
13+
spec: ['tests/end-to-end/api/*.ts', 'tests/end-to-end/api/helpers/**/*', 'tests/end-to-end/api/methods/**/*', 'tests/end-to-end/apps/*'],
1414
});

‎apps/meteor/.mocharc.api.livechat.js‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
'use strict';
2+
3+
/*
4+
* Mocha configuration for Livechat REST API integration tests.
5+
*/
6+
7+
module.exports = /** @satisfies {import('mocha').MochaOptions} */ ({
8+
...require('./.mocharc.base.json'), // see https://github.com/mochajs/mocha/issues/3916
9+
timeout: 10000,
10+
bail: true,
11+
retries: 0,
12+
file: 'tests/end-to-end/teardown.ts',
13+
spec: ['tests/end-to-end/api/livechat/**/*'],
14+
});

0 commit comments

Comments
 (0)