diff --git a/.github/actions/build-docker/action.yml b/.github/actions/build-docker/action.yml index 98028a261ea85..8149f5817d195 100644 --- a/.github/actions/build-docker/action.yml +++ b/.github/actions/build-docker/action.yml @@ -12,7 +12,7 @@ inputs: arch: required: false description: 'Architecture' - default: 'amd64' + default: 'arm64' service: required: false description: 'Container to build' diff --git a/.github/workflows/ci-code-check.yml b/.github/workflows/ci-code-check.yml index 63b4339018296..c6368e5574db3 100644 --- a/.github/workflows/ci-code-check.yml +++ b/.github/workflows/ci-code-check.yml @@ -15,7 +15,7 @@ env: jobs: code-check: - runs-on: ubuntu-24.04 + runs-on: ubuntu-24.04-arm name: ${{ matrix.check == 'ts' && 'TypeScript' || 'Code Lint' }} diff --git a/.github/workflows/ci-deploy-gh-pages.yml b/.github/workflows/ci-deploy-gh-pages.yml index 04a0565fc3e93..2494a819c1197 100644 --- a/.github/workflows/ci-deploy-gh-pages.yml +++ b/.github/workflows/ci-deploy-gh-pages.yml @@ -9,7 +9,7 @@ on: - develop jobs: deploy-preview: - runs-on: ubuntu-24.04 + runs-on: ubuntu-24.04-arm steps: - uses: actions/checkout@v5 - uses: rharkor/caching-for-turbo@v1.8 diff --git a/.github/workflows/ci-test-storybook.yml b/.github/workflows/ci-test-storybook.yml index 217e0a3ab9fd4..6729088ba107e 100644 --- a/.github/workflows/ci-test-storybook.yml +++ b/.github/workflows/ci-test-storybook.yml @@ -19,7 +19,7 @@ env: jobs: test: - runs-on: ubuntu-24.04 + runs-on: ubuntu-24.04-arm name: Test Storybook diff --git a/.github/workflows/ci-test-unit.yml b/.github/workflows/ci-test-unit.yml index dd5300898fec7..6f1d0096e0be6 100644 --- a/.github/workflows/ci-test-unit.yml +++ b/.github/workflows/ci-test-unit.yml @@ -23,7 +23,7 @@ env: jobs: test: - runs-on: ubuntu-24.04 + runs-on: ubuntu-24.04-arm name: Unit Tests diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 847b5e4854492..a694385823207 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ env: jobs: release-versions: name: ⚙️ Variables Setup - runs-on: ubuntu-24.04 + runs-on: ubuntu-24.04-arm outputs: release: ${{ steps.by-tag.outputs.release }} latest-release: ${{ steps.latest.outputs.latest-release }} @@ -121,7 +121,7 @@ jobs: notify-draft-services: name: 🚀 Notify external services - draft - runs-on: ubuntu-24.04 + runs-on: ubuntu-24.04-arm needs: [release-versions] steps: - uses: actions/checkout@v5 @@ -164,7 +164,7 @@ jobs: packages-build: name: 📦 Build Packages needs: [release-versions, notify-draft-services] - runs-on: ubuntu-24.04 + runs-on: ubuntu-24.04-arm steps: - name: Cache build uses: actions/cache@v4 @@ -238,7 +238,7 @@ jobs: build: name: 📦 Meteor Build (${{ matrix.type }}) needs: [release-versions, packages-build] - runs-on: ubuntu-24.04 + runs-on: ubuntu-24.04-arm strategy: fail-fast: false @@ -370,7 +370,7 @@ jobs: build-gh-docker-publish: name: 🚢 Publish Docker Images (ghcr.io) needs: [build-gh-docker, release-versions] - runs-on: ubuntu-24.04 + runs-on: ubuntu-24.04-arm env: DOCKER_TAG: ${{ needs.release-versions.outputs.gh-docker-tag }} @@ -639,7 +639,7 @@ jobs: tests-done: name: ✅ Tests Done - runs-on: ubuntu-24.04 + runs-on: ubuntu-24.04-arm needs: [checks, test-unit, test-api, test-ui, test-api-ee, test-ui-ee, test-ui-ee-watcher] if: always() steps: @@ -677,7 +677,7 @@ jobs: deploy: name: 🚀 Publish build assets - runs-on: ubuntu-24.04 + runs-on: ubuntu-24.04-arm if: github.event_name == 'release' || github.ref == 'refs/heads/develop' needs: [build-gh-docker-publish, release-versions] @@ -731,7 +731,7 @@ jobs: docker-image-publish: name: 🚀 Publish Docker Images (DockerHub) - runs-on: ubuntu-24.04 + runs-on: ubuntu-24.04-arm needs: [deploy, release-versions] env: @@ -847,7 +847,7 @@ jobs: notify-services: name: 🚀 Notify external services - runs-on: ubuntu-24.04 + runs-on: ubuntu-24.04-arm needs: - docker-image-publish - release-versions diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml index 778f83545d857..e5b4eabea8775 100644 --- a/docker-compose-ci.yml +++ b/docker-compose-ci.yml @@ -2,30 +2,29 @@ services: rocketchat: volumes: - ${COVERAGE_DIR:-/tmp/coverage}:${COVERAGE_DIR:-/tmp/coverage} - platform: linux/amd64 build: - dockerfile: ${GITHUB_WORKSPACE}/apps/meteor/.docker/Dockerfile.alpine + dockerfile: ${GITHUB_WORKSPACE:-}/apps/meteor/.docker/Dockerfile.alpine context: /tmp/build x-bake: platforms: - linux/amd64 - linux/arm64 args: - DENO_VERSION: ${DENO_VERSION} - image: ghcr.io/${LOWERCASE_REPOSITORY}/rocket.chat:${DOCKER_TAG}${DOCKER_TAG_SUFFIX_ROCKETCHAT} + DENO_VERSION: ${DENO_VERSION:-} + image: ghcr.io/${LOWERCASE_REPOSITORY}/rocket.chat:${DOCKER_TAG}${DOCKER_TAG_SUFFIX_ROCKETCHAT:-} environment: - TEST_MODE=true - - DEBUG=${DEBUG} + - DEBUG=${DEBUG:-} - EXIT_UNHANDLEDPROMISEREJECTION=true - MONGO_URL=mongodb://mongo:27017/rocketchat?replicaSet=rs0 - 'MONGO_OPLOG_URL=${MONGO_OPLOG_URL:-}' - 'TRANSPORTER=${TRANSPORTER:-}' - MOLECULER_LOG_LEVEL=info - - 'ROCKETCHAT_LICENSE=${ENTERPRISE_LICENSE}' - - 'COVERAGE_DIR=${COVERAGE_DIR}' - - 'COVERAGE_FILE_NAME=${COVERAGE_FILE_NAME}' - - 'COVERAGE_REPORTER=${COVERAGE_REPORTER}' - - DISABLE_DB_WATCHERS=${DISABLE_DB_WATCHERS} + - 'ROCKETCHAT_LICENSE=${ENTERPRISE_LICENSE:-}' + - 'COVERAGE_DIR=${COVERAGE_DIR:-}' + - 'COVERAGE_REPORTER=${COVERAGE_REPORTER:-}' + - 'COVERAGE_FILE_NAME=${COVERAGE_FILE_NAME:-}' + - DISABLE_DB_WATCHERS=${DISABLE_DB_WATCHERS:-} - OVERWRITE_SETTING_Log_Level=${DEBUG_LOG_LEVEL:-0} - Federation_Service_Enabled=true - 'Federation_Service_Domain=rc.host' @@ -47,7 +46,6 @@ services: test: wget --no-verbose --tries=1 --spider http://127.0.0.1:3000/livez || exit 1 authorization-service: - platform: linux/amd64 build: dockerfile: ee/apps/authorization-service/Dockerfile context: . @@ -68,7 +66,6 @@ services: - nats account-service: - platform: linux/amd64 build: dockerfile: ee/apps/account-service/Dockerfile context: . @@ -89,7 +86,6 @@ services: - nats presence-service: - platform: linux/amd64 build: dockerfile: ee/apps/presence-service/Dockerfile context: . @@ -110,7 +106,6 @@ services: - nats ddp-streamer-service: - platform: linux/amd64 build: dockerfile: ee/apps/ddp-streamer/Dockerfile context: . @@ -137,7 +132,6 @@ services: traefik.http.routers.ddp-streamer-service.rule: PathPrefix(`/websocket`) || PathPrefix(`/sockjs`) stream-hub-service: - platform: linux/amd64 build: dockerfile: ee/apps/stream-hub-service/Dockerfile context: . @@ -152,14 +146,13 @@ services: - MONGO_URL=mongodb://mongo:27017/rocketchat?replicaSet=rs0 - 'TRANSPORTER=${TRANSPORTER:-}' - MOLECULER_LOG_LEVEL=info - - DISABLE_DB_WATCHERS=${DISABLE_DB_WATCHERS} + - DISABLE_DB_WATCHERS=${DISABLE_DB_WATCHERS:-} extra_hosts: - 'host.docker.internal:host-gateway' depends_on: - nats queue-worker-service: - platform: linux/amd64 build: dockerfile: ee/apps/queue-worker/Dockerfile context: . @@ -180,7 +173,6 @@ services: - nats omnichannel-transcript-service: - platform: linux/amd64 build: dockerfile: ee/apps/omnichannel-transcript/Dockerfile context: . diff --git a/packages/jest-presets/package.json b/packages/jest-presets/package.json index 8f91fecefa0ae..bf8a171235991 100644 --- a/packages/jest-presets/package.json +++ b/packages/jest-presets/package.json @@ -27,7 +27,7 @@ "/server" ], "dependencies": { - "@swc/core": "~1.13.20", + "@swc/core": "1.13.19", "@swc/jest": "~0.2.39", "@testing-library/jest-dom": "~6.8.0", "@types/jest-axe": "~3.5.9", diff --git a/yarn.lock b/yarn.lock index 06b19f8906860..fd8165a381283 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8736,7 +8736,7 @@ __metadata: resolution: "@rocket.chat/jest-presets@workspace:packages/jest-presets" dependencies: "@rocket.chat/eslint-config": "workspace:~" - "@swc/core": "npm:~1.13.20" + "@swc/core": "npm:1.13.19" "@swc/jest": "npm:~0.2.39" "@testing-library/jest-dom": "npm:~6.8.0" "@types/identity-obj-proxy": "npm:^3.0.2" @@ -12151,9 +12151,9 @@ __metadata: languageName: node linkType: hard -"@swc/core-darwin-arm64@npm:1.13.20": - version: 1.13.20 - resolution: "@swc/core-darwin-arm64@npm:1.13.20" +"@swc/core-darwin-arm64@npm:1.13.19": + version: 1.13.19 + resolution: "@swc/core-darwin-arm64@npm:1.13.19" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard @@ -12165,9 +12165,9 @@ __metadata: languageName: node linkType: hard -"@swc/core-darwin-x64@npm:1.13.20": - version: 1.13.20 - resolution: "@swc/core-darwin-x64@npm:1.13.20" +"@swc/core-darwin-x64@npm:1.13.19": + version: 1.13.19 + resolution: "@swc/core-darwin-x64@npm:1.13.19" conditions: os=darwin & cpu=x64 languageName: node linkType: hard @@ -12179,9 +12179,9 @@ __metadata: languageName: node linkType: hard -"@swc/core-linux-arm-gnueabihf@npm:1.13.20": - version: 1.13.20 - resolution: "@swc/core-linux-arm-gnueabihf@npm:1.13.20" +"@swc/core-linux-arm-gnueabihf@npm:1.13.19": + version: 1.13.19 + resolution: "@swc/core-linux-arm-gnueabihf@npm:1.13.19" conditions: os=linux & cpu=arm languageName: node linkType: hard @@ -12193,9 +12193,9 @@ __metadata: languageName: node linkType: hard -"@swc/core-linux-arm64-gnu@npm:1.13.20": - version: 1.13.20 - resolution: "@swc/core-linux-arm64-gnu@npm:1.13.20" +"@swc/core-linux-arm64-gnu@npm:1.13.19": + version: 1.13.19 + resolution: "@swc/core-linux-arm64-gnu@npm:1.13.19" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard @@ -12207,9 +12207,9 @@ __metadata: languageName: node linkType: hard -"@swc/core-linux-arm64-musl@npm:1.13.20": - version: 1.13.20 - resolution: "@swc/core-linux-arm64-musl@npm:1.13.20" +"@swc/core-linux-arm64-musl@npm:1.13.19": + version: 1.13.19 + resolution: "@swc/core-linux-arm64-musl@npm:1.13.19" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard @@ -12221,9 +12221,9 @@ __metadata: languageName: node linkType: hard -"@swc/core-linux-x64-gnu@npm:1.13.20": - version: 1.13.20 - resolution: "@swc/core-linux-x64-gnu@npm:1.13.20" +"@swc/core-linux-x64-gnu@npm:1.13.19": + version: 1.13.19 + resolution: "@swc/core-linux-x64-gnu@npm:1.13.19" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard @@ -12235,9 +12235,9 @@ __metadata: languageName: node linkType: hard -"@swc/core-linux-x64-musl@npm:1.13.20": - version: 1.13.20 - resolution: "@swc/core-linux-x64-musl@npm:1.13.20" +"@swc/core-linux-x64-musl@npm:1.13.19": + version: 1.13.19 + resolution: "@swc/core-linux-x64-musl@npm:1.13.19" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard @@ -12249,9 +12249,9 @@ __metadata: languageName: node linkType: hard -"@swc/core-win32-arm64-msvc@npm:1.13.20": - version: 1.13.20 - resolution: "@swc/core-win32-arm64-msvc@npm:1.13.20" +"@swc/core-win32-arm64-msvc@npm:1.13.19": + version: 1.13.19 + resolution: "@swc/core-win32-arm64-msvc@npm:1.13.19" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard @@ -12263,9 +12263,9 @@ __metadata: languageName: node linkType: hard -"@swc/core-win32-ia32-msvc@npm:1.13.20": - version: 1.13.20 - resolution: "@swc/core-win32-ia32-msvc@npm:1.13.20" +"@swc/core-win32-ia32-msvc@npm:1.13.19": + version: 1.13.19 + resolution: "@swc/core-win32-ia32-msvc@npm:1.13.19" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard @@ -12277,29 +12277,29 @@ __metadata: languageName: node linkType: hard -"@swc/core-win32-x64-msvc@npm:1.13.20": - version: 1.13.20 - resolution: "@swc/core-win32-x64-msvc@npm:1.13.20" +"@swc/core-win32-x64-msvc@npm:1.13.19": + version: 1.13.19 + resolution: "@swc/core-win32-x64-msvc@npm:1.13.19" conditions: os=win32 & cpu=x64 languageName: node linkType: hard -"@swc/core@npm:^1.5.22": - version: 1.12.4 - resolution: "@swc/core@npm:1.12.4" +"@swc/core@npm:1.13.19": + version: 1.13.19 + resolution: "@swc/core@npm:1.13.19" dependencies: - "@swc/core-darwin-arm64": "npm:1.12.4" - "@swc/core-darwin-x64": "npm:1.12.4" - "@swc/core-linux-arm-gnueabihf": "npm:1.12.4" - "@swc/core-linux-arm64-gnu": "npm:1.12.4" - "@swc/core-linux-arm64-musl": "npm:1.12.4" - "@swc/core-linux-x64-gnu": "npm:1.12.4" - "@swc/core-linux-x64-musl": "npm:1.12.4" - "@swc/core-win32-arm64-msvc": "npm:1.12.4" - "@swc/core-win32-ia32-msvc": "npm:1.12.4" - "@swc/core-win32-x64-msvc": "npm:1.12.4" + "@swc/core-darwin-arm64": "npm:1.13.19" + "@swc/core-darwin-x64": "npm:1.13.19" + "@swc/core-linux-arm-gnueabihf": "npm:1.13.19" + "@swc/core-linux-arm64-gnu": "npm:1.13.19" + "@swc/core-linux-arm64-musl": "npm:1.13.19" + "@swc/core-linux-x64-gnu": "npm:1.13.19" + "@swc/core-linux-x64-musl": "npm:1.13.19" + "@swc/core-win32-arm64-msvc": "npm:1.13.19" + "@swc/core-win32-ia32-msvc": "npm:1.13.19" + "@swc/core-win32-x64-msvc": "npm:1.13.19" "@swc/counter": "npm:^0.1.3" - "@swc/types": "npm:^0.1.23" + "@swc/types": "npm:^0.1.25" peerDependencies: "@swc/helpers": ">=0.5.17" dependenciesMeta: @@ -12326,26 +12326,26 @@ __metadata: peerDependenciesMeta: "@swc/helpers": optional: true - checksum: 10/663a646b593771b27f9c8e0e4a064cce1a58562f41e52890b50af29da928c2a137b685567d0b2e2da3ef2649d42cd8ecf92f909ebb52f7a6c808278ff81806b5 + checksum: 10/07d0f72d8c82070a1ec2b439964780f0ba7aec61b17fa6518b1c372373bbe208ea9ce68f70f606d42df71a33149e4f704eabe07c6197e15d133e375546915f57 languageName: node linkType: hard -"@swc/core@npm:~1.13.20": - version: 1.13.20 - resolution: "@swc/core@npm:1.13.20" +"@swc/core@npm:^1.5.22": + version: 1.12.4 + resolution: "@swc/core@npm:1.12.4" dependencies: - "@swc/core-darwin-arm64": "npm:1.13.20" - "@swc/core-darwin-x64": "npm:1.13.20" - "@swc/core-linux-arm-gnueabihf": "npm:1.13.20" - "@swc/core-linux-arm64-gnu": "npm:1.13.20" - "@swc/core-linux-arm64-musl": "npm:1.13.20" - "@swc/core-linux-x64-gnu": "npm:1.13.20" - "@swc/core-linux-x64-musl": "npm:1.13.20" - "@swc/core-win32-arm64-msvc": "npm:1.13.20" - "@swc/core-win32-ia32-msvc": "npm:1.13.20" - "@swc/core-win32-x64-msvc": "npm:1.13.20" + "@swc/core-darwin-arm64": "npm:1.12.4" + "@swc/core-darwin-x64": "npm:1.12.4" + "@swc/core-linux-arm-gnueabihf": "npm:1.12.4" + "@swc/core-linux-arm64-gnu": "npm:1.12.4" + "@swc/core-linux-arm64-musl": "npm:1.12.4" + "@swc/core-linux-x64-gnu": "npm:1.12.4" + "@swc/core-linux-x64-musl": "npm:1.12.4" + "@swc/core-win32-arm64-msvc": "npm:1.12.4" + "@swc/core-win32-ia32-msvc": "npm:1.12.4" + "@swc/core-win32-x64-msvc": "npm:1.12.4" "@swc/counter": "npm:^0.1.3" - "@swc/types": "npm:^0.1.25" + "@swc/types": "npm:^0.1.23" peerDependencies: "@swc/helpers": ">=0.5.17" dependenciesMeta: @@ -12372,7 +12372,7 @@ __metadata: peerDependenciesMeta: "@swc/helpers": optional: true - checksum: 10/fdbd34f98d894cc765e44bab27da5fa95e604660ae061f5eafeaf459418e1d32e8b8f2333966a6c32fef4770e9948f9cec3bdacc8a35d6b1b32bc48677777261 + checksum: 10/663a646b593771b27f9c8e0e4a064cce1a58562f41e52890b50af29da928c2a137b685567d0b2e2da3ef2649d42cd8ecf92f909ebb52f7a6c808278ff81806b5 languageName: node linkType: hard