Skip to content

Commit

Permalink
Merge pull request #315 from openedx/jawayria/support-node-16
Browse files Browse the repository at this point in the history
feat: Added support for Node 16
  • Loading branch information
Jawayria authored Mar 30, 2022
2 parents 8e8c5d8 + 72d74d3 commit c03100e
Show file tree
Hide file tree
Showing 6 changed files with 37,924 additions and 14,682 deletions.
13 changes: 9 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,23 @@ on:
- "**"

jobs:
build:
tests:
runs-on: ubuntu-20.04
strategy:
matrix:
node: [ 12, 14, 16 ]

steps:
- name: Checkout
uses: actions/checkout@v2

- name: Setup Nodejs
uses: actions/setup-node@v1
with:
node-version: 12
node-version: ${{ matrix.node }}

- name: Setup npm
run: npm i -g npm@5.8.0
run: npm i -g npm@8.x.x

- name: Install dependencies
run: npm ci
Expand Down Expand Up @@ -51,6 +55,7 @@ jobs:
username: ${{secrets.EDX_SMTP_USERNAME}}
password: ${{secrets.EDX_SMTP_PASSWORD}}
subject: CI workflow failed in ${{github.repository}}
to: tnl-squad@edx.org
to: teaching-and-learning@edx.opsgenie.net
from: github-actions <[email protected]>
body: CI workflow in ${{github.repository}} failed! For details see "github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"

1 change: 1 addition & 0 deletions .github/workflows/npm-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ jobs:
release:
name: Release
runs-on: ubuntu-20.04

steps:
- name: Checkout
uses: actions/checkout@v2
Expand Down
13 changes: 10 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
FROM node:8.11
FROM node:16

USER root
RUN apt-get update
RUN apt-get install -y vim
RUN npm i -g npm@6.1.0
RUN npm i -g npm@8.x.x

WORKDIR /prebuilt
COPY config/ config/
COPY src/accessibilityIndex.jsx src/accessibilityIndex.jsx
COPY src/courseHealthCheckIndex.jsx src/courseHealthCheckIndex.jsx
COPY src/courseOutlineHealthCheckIndex.jsx src/courseOutlineHealthCheckIndex.jsx
COPY src/data/i18n/locales src/data/i18n/locales
COPY src/editImageModalIndex.jsx src/editImageModalIndex.jsx
COPY src/index.jsx src/index.jsx
COPY package.json .
RUN npm install --silent
RUN npm install

WORKDIR /studio-frontend
ENTRYPOINT cp -r /prebuilt/node_modules /studio-frontend/ && \
Expand Down
1 change: 1 addition & 0 deletions config/webpack.prod.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ module.exports = Merge.smart(commonConfig, {
path.resolve(__dirname, '../src'),
],
loader: 'babel-loader',
options: { presets: ['@babel/env', '@babel/preset-react'] },
},
{
type: 'javascript/auto',
Expand Down
Loading

0 comments on commit c03100e

Please sign in to comment.