Skip to content

Commit

Permalink
node 16
Browse files Browse the repository at this point in the history
  • Loading branch information
MariaAga committed Jan 26, 2024
1 parent 89c6104 commit 4859b8e
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 5 deletions.
3 changes: 2 additions & 1 deletion .github/matrix.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"postgresql": ["12"],
"ruby": ["2.7"],
"node": ["14"]
"node": ["16"],
"npm": ["6"]
}
2 changes: 2 additions & 0 deletions .github/workflows/foreman.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ jobs:
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
- name: Install npm ${{ matrix.npm }}"
run: npm install -g npm@${{ matrix.npm }}"
- name: Setup NPM Cache
uses: actions/cache@v4
with:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/js_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ jobs:
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
- name: Install npm ${{ matrix.npm }}"
run: npm install -g npm@${{ matrix.npm }}"
- name: Generate npm dependencies package-lock
run: npm install --package-lock-only --no-audit
- name: Install npm dependencies
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/plugins_react_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ jobs:
node-version: ${{ matrix.node }}
# We could update the postinstall action for foreman to look for an environment variable for plugin webpack dirs
# before kicking off the ruby script to find them, this would eliminate the ruby dep and running `npm install` in plugins.
- name: Install npm ${{ matrix.npm }}"
run: npm install -g npm@${{ matrix.npm }}"
- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Base container that is used for both building and running the app
FROM quay.io/centos/centos:stream8 as base
ARG RUBY_VERSION="2.7"
ARG NODEJS_VERSION="14"
ARG NODEJS_VERSION="16"
ENV FOREMAN_FQDN=foreman.example.com
ENV FOREMAN_DOMAIN=example.com

Expand Down
2 changes: 1 addition & 1 deletion developer_docs/foreman_dev_setup.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
Foreman will run with the following requirements (aside from rubygem dependencies):

* Ruby 2.7.x
* NodeJS 14
* NodeJS 16.x
* NPM 6.x
* PostgreSQL 13

Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"description": "Foreman isn't really a node module, these are just dependencies needed to build the webpack bundle. 'dependencies' are the asset libraries in use and 'devDependencies' are used for the build process.",
"private": true,
"engines": {
"node": ">14.0.0 <16.0.0"
"node": "^16.0.0",
"npm": "^6.0.0"
},
"scripts": {
"lint": "tfm-lint",
Expand All @@ -25,6 +26,7 @@
"graphql-tag": "^2.11.0",
"intl": "~1.2.5",
"jed": "^1.1.1",
"npm": "^6.14.18",
"os-browserify": "^0.3.0",
"react-intl": "^2.8.0"
},
Expand Down Expand Up @@ -55,7 +57,6 @@
"pretty-format": "26.6.2",
"raw-loader": "^0.5.1",
"react-dnd-test-backend": "^9.4.0",
"react-dnd-test-utils": "^9.4.0",
"react-remarkable": "^1.1.3",
"redux-mock-store": "^1.2.2",
"sass": "~1.60.0",
Expand Down

0 comments on commit 4859b8e

Please sign in to comment.