Matrix-Mirrors/mjolnir
1
0
Fork 0
mirror of https://github.com/matrix-org/mjolnir.git synced 2024-09-29 20:56:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

try win dns res

Browse Source
This commit is contained in:
H. Shay 2023-11-08 11:30:42 -08:00
parent 7ca748c3c0
commit a1f2b5e501
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/mjolnir.yml vendored
View File

@ -17,10 +17,10 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Specifically use node 16 like in the readme. - name: Specifically use node 18 like in the readme.
uses: actions/setup-node@v3 uses: actions/setup-node@v3
with: with:
node-version: '16' node-version: '18'
- run: yarn install - run: yarn install
- run: yarn build - run: yarn build
- run: yarn lint - run: yarn lint
@ -29,10 +29,10 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Specifically use node 16 like in the readme. - name: Specifically use node 18 like in the readme.
uses: actions/setup-node@v3 uses: actions/setup-node@v3
with: with:
node-version: '16' node-version: '18'
- run: yarn install - run: yarn install
- run: yarn test - run: yarn test
integration: integration:
@ -43,7 +43,7 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions/setup-node@v3 - uses: actions/setup-node@v3
with: with:
node-version: '16' node-version: '18'
- name: Fetch and build mx-tester (cached across runs) - name: Fetch and build mx-tester (cached across runs)
uses: baptiste0928/cargo-install@v1 uses: baptiste0928/cargo-install@v1
with: with:
@ -65,7 +65,7 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions/setup-node@v3 - uses: actions/setup-node@v3
with: with:
node-version: '16' node-version: '18'
- name: Fetch and build mx-tester (cached across runs) - name: Fetch and build mx-tester (cached across runs)
uses: baptiste0928/cargo-install@v1 uses: baptiste0928/cargo-install@v1
with: with:

2
Dockerfile
View File

@ -1,5 +1,5 @@
# We can't use alpine anymore because crypto has rust deps. # We can't use alpine anymore because crypto has rust deps.
FROM node:16-slim FROM node:18-slim
COPY . /tmp/src COPY . /tmp/src
RUN cd /tmp/src \ RUN cd /tmp/src \
&& yarn install \ && yarn install \

2
docs/setup_selfbuild.md
View File

@ -1,5 +1,5 @@
These instructions are to build and run mjolnir without using [Docker](./setup_docker.md). These instructions are to build and run mjolnir without using [Docker](./setup_docker.md).
To build mjolnir, you have to have installed [Node >=16](https://nodejs.org/en/download/), [npm](https://docs.npmjs.com/cli/v7/configuring-npm/install) and [yarn >1.x](https://classic.yarnpkg.com/en/docs/install). To build mjolnir, you have to have installed [Node >=18](https://nodejs.org/en/download/), [npm](https://docs.npmjs.com/cli/v7/configuring-npm/install) and [yarn >1.x](https://classic.yarnpkg.com/en/docs/install).
Copy the latest release tag from https://github.com/matrix-org/mjolnir/releases/latest/ to use when cloning. For example `v1.6.1` - please check the link for the current version as this mentioned example might be outdated. Copy the latest release tag from https://github.com/matrix-org/mjolnir/releases/latest/ to use when cloning. For example `v1.6.1` - please check the link for the current version as this mentioned example might be outdated.

2
package.json
View File

@ -64,6 +64,6 @@
"yaml": "^2.2.2" "yaml": "^2.2.2"
}, },
"engines": { "engines": {
"node": ">=16.0.0" "node": ">=18.0.0"
} }
} }

3
test/integration/fixtures.ts
View File

@ -1,6 +1,9 @@
import { read as configRead } from "../../src/config"; import { read as configRead } from "../../src/config";
import { makeMjolnir, teardownManagementRoom } from "./mjolnirSetupUtils"; import { makeMjolnir, teardownManagementRoom } from "./mjolnirSetupUtils";
import { register } from "prom-client"; import { register } from "prom-client";
import dns from 'node:dns';
dns.setDefaultResultOrder('ipv4first');
// When Mjolnir starts (src/index.ts) it clobbers the config by resolving the management room // When Mjolnir starts (src/index.ts) it clobbers the config by resolving the management room
// alias specified in the config (config.managementRoom) and overwriting that with the room ID. // alias specified in the config (config.managementRoom) and overwriting that with the room ID.