Skip to content

Commit

Permalink
Merge pull request #1267 from cdapio/cherry-pick-node22-upgrade-610
Browse files Browse the repository at this point in the history
Cherry pick node upgrade  & build fixes to 6.10 Release
  • Loading branch information
itsankit-google authored Dec 9, 2024
2 parents e869749 + 6504710 commit b5af8ec
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 21 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ jobs:
with:
submodules: recursive

# installing node 16.16
- name: Use Node.js 16.16
# installing node 22.12
- name: Use Node.js 22.12
uses: actions/setup-node@v3.6.0
with:
node-version: 16.16
node-version: 22.12

- uses: actions/cache@v3.3.0
with:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ describe('DataFormatter', () => {
minute: 'numeric',
second: 'numeric',
})
).toBe('Thursday, September 16, 2021, 10:33:30 AM');
).toBe('Thursday, September 16, 2021 at 10:33:30 AM');
});
});
});
30 changes: 15 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,25 @@
"license": "Apache-2.0",
"scripts": {
"dev": "concurrently \"yarn start\" \"gulp watch\" \"yarn cdap-dev-build-w\" \"yarn build-dev-common-w\"",
"start": "yarn run build-server && NODE_ENV=development node ./packaged/server_dist/index.js",
"cdap-prod-build": "NODE_ENV=production parallel-webpack",
"cdap-dev-build": "NODE_ENV=development parallel-webpack --config=webpack.config.js -d",
"cdap-dev-build-w": "NODE_ENV=development parallel-webpack --watch -d ",
"reload-dev-w": "NODE_ENV=reload node --max-old-space-size=8192 ./node_modules/.bin/webpack-dev-server --mode development --progress --config=./webpack.config.cdap.dev.js",
"hmr-dev-w": "NODE_ENV=hmr node --max-old-space-size=8192 ./node_modules/.bin/webpack-dev-server --mode development --progress --config=./webpack.config.cdap.dev.js",
"cdap-full-build": "run-p cdap-prod-build distribute",
"cdap-full-build-more-memory": "NODE_OPTIONS=\"--max_old_space_size=8192\" run-p cdap-prod-build distribute",
"cdap-non-optimized-full-build": "NODE_ENV=non-optimized-production webpack --config=webpack.config.js",
"start": "NODE_OPTIONS=\"--openssl-legacy-provider\" yarn run build-server && NODE_ENV=development node ./packaged/server_dist/index.js",
"cdap-prod-build": "NODE_OPTIONS=\"--openssl-legacy-provider\" NODE_ENV=production parallel-webpack",
"cdap-dev-build": "NODE_OPTIONS=\"--openssl-legacy-provider\" NODE_ENV=development parallel-webpack --config=webpack.config.js -d",
"cdap-dev-build-w": "NODE_OPTIONS=\"--openssl-legacy-provider\" NODE_ENV=development parallel-webpack --watch -d ",
"reload-dev-w": "NODE_OPTIONS=\"--openssl-legacy-provider\" NODE_ENV=reload node --max-old-space-size=8192 ./node_modules/.bin/webpack-dev-server --mode development --progress --config=./webpack.config.cdap.dev.js",
"hmr-dev-w": "NODE_OPTIONS=\"--openssl-legacy-provider\" NODE_ENV=hmr node --max-old-space-size=8192 ./node_modules/.bin/webpack-dev-server --mode development --progress --config=./webpack.config.cdap.dev.js",
"cdap-full-build": "NODE_OPTIONS=\"--openssl-legacy-provider\" run-p cdap-prod-build distribute",
"cdap-full-build-more-memory": "NODE_OPTIONS=\"--openssl-legacy-provider --max_old_space_size=8192\" run-p cdap-prod-build distribute",
"cdap-non-optimized-full-build": "NODE_OPTIONS=\"--openssl-legacy-provider\" NODE_ENV=non-optimized-production webpack --config=webpack.config.js",
"clean-node-modules": "modclean -P -r --patterns=\"default:safe\" --additional-patterns=\"*.xls?x,*.ppt?x,*.rtf,*.png,*.jpg,*.jpeg,*.txt\" --ignore=\"validate-npm-license,readme*\"",
"distribute": "node ./node_modules/gulp/bin/gulp.js distribute",
"build": "node ./node_modules/gulp/bin/gulp.js build",
"build-w": "node ./node_modules/gulp/bin/gulp.js watch",
"build-prod-common": "NODE_ENV=production parallel-webpack --config=webpack.config.common.js",
"build-dev-common": "NODE_ENV=development parallel-webpack --config=webpack.config.common.js",
"build-dev-common-w": "NODE_ENV=development parallel-webpack --config=webpack.config.common.js -d --watch",
"build-prod-dlls": "NODE_ENV=production parallel-webpack --config=webpack.config.dlls.js",
"build-dev-dlls": "NODE_ENV=development parallel-webpack --config=webpack.config.dlls.js",
"build-server": "webpack --config=webpack.config.server.js",
"build-prod-common": "NODE_OPTIONS=\"--openssl-legacy-provider\" NODE_ENV=production parallel-webpack --config=webpack.config.common.js",
"build-dev-common": "NODE_OPTIONS=\"--openssl-legacy-provider\" NODE_ENV=development parallel-webpack --config=webpack.config.common.js",
"build-dev-common-w": "NODE_OPTIONS=\"--openssl-legacy-provider\" NODE_ENV=development parallel-webpack --config=webpack.config.common.js -d --watch",
"build-prod-dlls": "NODE_OPTIONS=\"--openssl-legacy-provider\" NODE_ENV=production parallel-webpack --config=webpack.config.dlls.js",
"build-dev-dlls": "NODE_OPTIONS=\"--openssl-legacy-provider\" NODE_ENV=development parallel-webpack --config=webpack.config.dlls.js",
"build-server": "NODE_OPTIONS=\"--openssl-legacy-provider\" webpack --config=webpack.config.server.js",
"jest": "jest --coverage",
"jest-w": "jest --watch",
"karma-test": "node ./node_modules/karma/bin/karma start test/karma-conf.js",
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@
<goal>install-node-and-yarn</goal>
</goals>
<configuration>
<nodeVersion>v16.20.0</nodeVersion>
<nodeVersion>v22.12.0</nodeVersion>
<yarnVersion>v1.22.19</yarnVersion>
</configuration>
</execution>
Expand Down Expand Up @@ -370,7 +370,7 @@
<goal>install-node-and-yarn</goal>
</goals>
<configuration>
<nodeVersion>v16.16.0</nodeVersion>
<nodeVersion>v22.12.0</nodeVersion>
<yarnVersion>v1.7.0</yarnVersion>
</configuration>
</execution>
Expand Down

0 comments on commit b5af8ec

Please sign in to comment.