Skip to content

Commit

Permalink
add support node 17
Browse files Browse the repository at this point in the history
  • Loading branch information
Mavrin committed Feb 12, 2022
1 parent b5f34b8 commit a30dcd2
Show file tree
Hide file tree
Showing 6 changed files with 21,902 additions and 1,226 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci-frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node: [14.15]
node: [16.13.2]

steps:
- uses: actions/checkout@v2
Expand All @@ -44,7 +44,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node: [14.15]
node: [16.13.2]

steps:
- uses: actions/checkout@v2
Expand All @@ -69,7 +69,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node: [14.15]
node: [16.13.2]

steps:
- uses: actions/checkout@v2
Expand All @@ -80,14 +80,14 @@ jobs:
- run: npm ci --loglevel warn
working-directory: ./frontend

- run: npx run-p lint
- run: npm run lint
working-directory: ./frontend

test:
runs-on: ubuntu-latest
strategy:
matrix:
node: [14.15]
node: [16.13.2]

steps:
- uses: actions/checkout@v2
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ RUN \
echo "version=$version" && \
go build -o remark42 -ldflags "-X main.revision=${version} -s -w" ./app

FROM --platform=$BUILDPLATFORM node:12.16-alpine as build-frontend-deps
FROM --platform=$BUILDPLATFORM node:16.13.2-alpine as build-frontend-deps

ARG CI
ENV HUSKY_SKIP_INSTALL=true
Expand All @@ -40,7 +40,7 @@ ADD frontend/package.json /srv/frontend/package.json
ADD frontend/package-lock.json /srv/frontend/package-lock.json
RUN cd /srv/frontend && CI=true npm ci --loglevel warn

FROM --platform=$BUILDPLATFORM node:12.16-alpine as build-frontend
FROM --platform=$BUILDPLATFORM node:16.13.2-alpine as build-frontend

ARG CI
ARG SKIP_FRONTEND_TEST
Expand All @@ -49,7 +49,7 @@ ARG NODE_ENV=production
COPY --from=build-frontend-deps /srv/frontend/node_modules /srv/frontend/node_modules
ADD frontend /srv/frontend
RUN cd /srv/frontend && \
if [ -z "$SKIP_FRONTEND_TEST" ] ; then npx run-p lint test check; \
if [ -z "$SKIP_FRONTEND_TEST" ] ; then npm run lint test check; \
else echo "skip frontend tests and lint" ; npm run build ; fi && \
rm -rf ./node_modules

Expand Down
Loading

0 comments on commit a30dcd2

Please sign in to comment.