Skip to content

Commit

Permalink
Merge pull request #4479 from coralproject/develop
Browse files Browse the repository at this point in the history
[8.7.0] merge `develop` into `main`
  • Loading branch information
nick-funk authored Jan 10, 2024
2 parents fb1a902 + c94f6ae commit 4766f04
Show file tree
Hide file tree
Showing 38 changed files with 9,995 additions and 8,829 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ env:
jobs:
build-and-test:
name: Build and Test
runs-on: ubuntu-22.04
runs-on: coral-ci
steps:
-
name: Checkout
Expand Down Expand Up @@ -43,10 +43,10 @@ jobs:
name: Define SHORT_SHA with commit short sha
run: echo "SHORT_SHA=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
-
name: Setup Node14.x
name: Setup Node18.x
uses: actions/setup-node@v3
with:
node-version: '14.x'
node-version: '18.16.x'
-
name: Install npm 8
run: npm i -g npm@8.0.0 --registry=https://registry.npmjs.org
Expand Down Expand Up @@ -108,7 +108,7 @@ jobs:
npx @coralproject/package-version-lint
-
name: Run Server Unit Tests
run: cd server && npm run test:server -- --ci --runInBand --reporters=default --reporters=jest-junit
run: cd server && npm run test:server -- --ci --reporters=default --reporters=jest-junit
-
name: Run Client Stream Unit Tests
run: cd client && npm run test:client:stream -- --ci --runInBand --reporters=default --reporters=jest-junit
Expand All @@ -121,7 +121,7 @@ jobs:
-
name: Build
env:
NODE_OPTIONS: "--max-old-space-size=8192"
NODE_OPTIONS: "--max-old-space-size=14336"
run: sh scripts/build.sh
-
name: Verify Bundle Size
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-test-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ env:
jobs:
build-and-test:
name: Build, Test, and Deploy
runs-on: ubuntu-22.04
runs-on: coral-ci
steps:
-
name: Checkout
Expand Down Expand Up @@ -51,10 +51,10 @@ jobs:
name: Define RC_TAG
run: echo "RC_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-
name: Setup Node14.x
name: Setup Node18.x
uses: actions/setup-node@v3
with:
node-version: '14.x'
node-version: '18.16.x'
-
name: Install npm 8
run: npm i -g npm@8.0.0 --registry=https://registry.npmjs.org
Expand Down Expand Up @@ -121,7 +121,7 @@ jobs:
-
name: Build
env:
NODE_OPTIONS: "--max-old-space-size=8192"
NODE_OPTIONS: "--max-old-space-size=14336"
run: sh scripts/build.sh
-
name: Verify Bundle Size
Expand Down
7 changes: 4 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
FROM node:14-alpine
FROM node:18-alpine

ENV NODE_OPTIONS=--max-old-space-size=8192
ENV NODE_OPTIONS="--max-old-space-size=8192 --openssl-legacy-provider --no-experimental-fetch"

# Install build dependancies.
RUN apk --no-cache add git python3
RUN apk --no-cache --update add g++ make git python3 \
&& rm -rf /var/cache/apk/*

RUN npm install -g npm@8.0.0

Expand Down
2 changes: 1 addition & 1 deletion client/.nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14
18
5 changes: 3 additions & 2 deletions client/config/webpackDevServer.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@ export default function ({
disableDotRule: true,
rewrites: [],
},
public: allowedHost,
allowedHosts: ["127.0.0.1:8080", "127.0.0.1:3000"],
public: "127.0.0.1:8080",
index: "embed.html",
sockPort: devPort,
proxy: [
Expand All @@ -105,7 +106,7 @@ export default function ({
"/graphiql",
].some((p) => p === lc || lc.startsWith(`${p}/`));
},
target: `http://localhost:${serverPort}`,
target: `127.0.0.1:${serverPort}`,
onError: (err, req, res) => {
res.writeHead(500, {
"Content-Type": "text/html",
Expand Down
Loading

0 comments on commit 4766f04

Please sign in to comment.