Skip to content

Commit 89612f8

Browse files
committed
Remove rest of matrix package dependencies
1 parent 9488d17 commit 89612f8

File tree

5 files changed

+32
-622
lines changed

5 files changed

+32
-622
lines changed

.github/actions/build-docker/action.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,6 @@ runs:
8585
- run: yarn build
8686
if: inputs.setup == 'true'
8787
shell: bash
88-
- if: ${{ inputs.platform == 'alpine' }}
89-
uses: actions/cache@v4
90-
with:
91-
path: /tmp/build/matrix-sdk-crypto.linux-x64-musl.node
92-
key: matrix-rust-sdk-crypto-nodejs-v0.2.0-beta.1
9388

9489
- name: Build Docker images
9590
shell: bash

.github/workflows/ci.yml

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -247,51 +247,6 @@ jobs:
247247
deno-version: ${{ needs.release-versions.outputs.deno-version }}
248248
coverage: false
249249

250-
# TODO: this should go away once upstream builds are fixed
251-
build-matrix-rust-bindings-for-alpine:
252-
name: Builds matrix rust bindings against alpine
253-
runs-on: ubuntu-24.04
254-
steps:
255-
- name: check cache for matrix-rust-sdk-crypto-nodejs
256-
id: matrix-rust-sdk-crypto-nodejs
257-
uses: actions/cache@v4
258-
with:
259-
path: /tmp/build/matrix-sdk-crypto.linux-x64-musl.node
260-
key: matrix-rust-sdk-crypto-nodejs-v0.2.0-beta.1
261-
262-
- uses: actions/checkout@v4
263-
with:
264-
repository: matrix-org/matrix-rust-sdk-crypto-nodejs
265-
ref: v0.2.0-beta.1 # https://github.com/element-hq/matrix-bot-sdk/blob/e72a4c498e00c6c339a791630c45d00a351f56a8/package.json#L58
266-
267-
- if: steps.matrix-rust-sdk-crypto-nodejs.outputs.cache-hit != 'true'
268-
run: sudo apt-get install -y musl-tools libunwind-dev && find /usr/include -name stdarg.h 2>/dev/null || true
269-
270-
- if: steps.matrix-rust-sdk-crypto-nodejs.outputs.cache-hit != 'true'
271-
uses: actions/setup-node@v4.4.0
272-
with:
273-
node-version: 22.16.0
274-
275-
- if: steps.matrix-rust-sdk-crypto-nodejs.outputs.cache-hit != 'true'
276-
uses: actions-rust-lang/setup-rust-toolchain@v1
277-
with:
278-
toolchain: '1.76'
279-
target: x86_64-unknown-linux-musl
280-
281-
- if: steps.matrix-rust-sdk-crypto-nodejs.outputs.cache-hit != 'true'
282-
name: Install ziglang
283-
uses: mlugg/setup-zig@v1
284-
with:
285-
version: 0.13.0
286-
287-
- if: steps.matrix-rust-sdk-crypto-nodejs.outputs.cache-hit != 'true'
288-
name: Build
289-
run: |
290-
npm install --ignore-scripts
291-
npx napi build --release --target x86_64-unknown-linux-musl --platform --zig
292-
mkdir -p /tmp/build
293-
mv matrix-sdk-crypto.linux-x64-musl.node /tmp/build/matrix-sdk-crypto.linux-x64-musl.node
294-
295250
build-gh-docker-coverage:
296251
name: 🚢 Build Docker Images for Testing
297252
needs: [build, release-versions, build-matrix-rust-bindings-for-alpine]
@@ -323,11 +278,6 @@ jobs:
323278
build-containers: ${{ matrix.platform == needs.release-versions.outputs.official-platform && 'authorization-service account-service ddp-streamer-service presence-service stream-hub-service queue-worker-service omnichannel-transcript-service' || '' }}
324279
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
325280

326-
- name: Make sure matrix bindings load
327-
if: (github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'release' || github.ref == 'refs/heads/develop') && matrix.platform == 'alpine' && github.actor != 'dependabot[bot]'
328-
run: |
329-
docker run --rm -w /app/bundle/programs/server/npm/node_modules/matrix-appservice-bridge ghcr.io/rocketchat/rocket.chat:$RC_DOCKER_TAG -e 'require(".")'
330-
331281
- name: Rename official Docker tag to GitHub Container Registry
332282
if: matrix.platform == needs.release-versions.outputs.official-platform && (github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'release' || github.ref == 'refs/heads/develop') && github.actor != 'dependabot[bot]'
333283
run: |

apps/meteor/.docker/Dockerfile.alpine

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ RUN cd /app/bundle/programs/server \
4141
&& npm install sharp@0.32.6 --no-save \
4242
&& mv node_modules/sharp npm/node_modules/sharp \
4343
# End hack for sharp
44-
&& cd /app/bundle/programs/server/npm/node_modules/@vector-im/matrix-bot-sdk \
45-
&& npm install \
4644
# # Start hack for isolated-vm...
4745
# && rm -rf npm/node_modules/isolated-vm \
4846
# && npm install isolated-vm@4.6.0 \
@@ -58,9 +56,6 @@ RUN apk del deps
5856

5957
USER rocketchat
6058

61-
# TODO: remove hack once upstream builds are fixed
62-
COPY --chown=rocketchat:rocketchat matrix-sdk-crypto.linux-x64-musl.node /app/bundle/programs/server/npm/node_modules/@matrix-org/matrix-sdk-crypto-nodejs
63-
6459
VOLUME /app/uploads
6560

6661
WORKDIR /app/bundle

apps/meteor/package.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,6 @@
315315
"@slack/rtm-api": "^7.0.3",
316316
"@tanstack/react-query": "~5.65.1",
317317
"@types/meteor": "^2.9.9",
318-
"@vector-im/matrix-bot-sdk": "0.7.1-element.11",
319318
"@xmldom/xmldom": "^0.8.10",
320319
"adm-zip": "0.5.16",
321320
"ajv": "^8.17.1",
@@ -396,8 +395,6 @@
396395
"lodash.get": "^4.4.2",
397396
"mailparser": "^3.7.3",
398397
"marked": "^4.3.0",
399-
"matrix-appservice": "^2.0.0",
400-
"matrix-appservice-bridge": "^10.3.3",
401398
"mem": "^8.1.1",
402399
"meteor-node-stubs": "^1.2.19",
403400
"mime-db": "^1.52.0",

0 commit comments

Comments
 (0)