build: minor ci cleanup (#4652)
* chore: show js webpack stats when building * chore: use npm ci for code_style to avoid overwriting package-lock.json * chore: add brew-update to macos ci * remove webpack-dev-server from deps
This commit is contained in:
parent
977a190646
commit
b055b98d0f
|
@ -185,6 +185,7 @@ jobs:
|
||||||
echo '${{ toJSON(runner) }}'
|
echo '${{ toJSON(runner) }}'
|
||||||
sw_vers
|
sw_vers
|
||||||
- name: Get Dependencies
|
- name: Get Dependencies
|
||||||
|
run: brew update
|
||||||
run: brew install cmake gettext libdeflate libevent libnatpmp libpsl miniupnpc ninja node
|
run: brew install cmake gettext libdeflate libevent libnatpmp libpsl miniupnpc ninja node
|
||||||
- name: Get Dependencies (GTK)
|
- name: Get Dependencies (GTK)
|
||||||
if: ${{ needs.what-to-make.outputs.make-gtk == 'true' }}
|
if: ${{ needs.what-to-make.outputs.make-gtk == 'true' }}
|
||||||
|
@ -458,6 +459,7 @@ jobs:
|
||||||
echo '${{ toJSON(runner) }}'
|
echo '${{ toJSON(runner) }}'
|
||||||
sw_vers
|
sw_vers
|
||||||
- name: Get Dependencies
|
- name: Get Dependencies
|
||||||
|
run: brew update
|
||||||
run: brew install cmake gettext libdeflate libevent libnatpmp libpsl miniupnpc ninja node
|
run: brew install cmake gettext libdeflate libevent libnatpmp libpsl miniupnpc ninja node
|
||||||
- name: Get Dependencies (GTK)
|
- name: Get Dependencies (GTK)
|
||||||
if: ${{ needs.what-to-make.outputs.make-gtk == 'true' }}
|
if: ${{ needs.what-to-make.outputs.make-gtk == 'true' }}
|
||||||
|
|
|
@ -78,8 +78,8 @@ fi
|
||||||
# format JS
|
# format JS
|
||||||
cd "${root}/web" || exit 1
|
cd "${root}/web" || exit 1
|
||||||
npm_lint_args="$([ -n "$fix" ] && echo 'lint:fix' || echo 'lint')"
|
npm_lint_args="$([ -n "$fix" ] && echo 'lint:fix' || echo 'lint')"
|
||||||
if ! npm install --no-audit --no-fund --no-progress &>/dev/null; then
|
if ! npm ci --no-audit --no-fund --no-progress &>/dev/null; then
|
||||||
[ -n "$fix" ] || echo 'JS code could not be checked -- "npm install" failed'
|
[ -n "$fix" ] || echo 'JS code could not be checked -- "npm ci" failed'
|
||||||
exitcode=1
|
exitcode=1
|
||||||
elif ! npm run --silent $npm_lint_args; then
|
elif ! npm run --silent $npm_lint_args; then
|
||||||
[ -n "$fix" ] || echo 'JS code needs formatting'
|
[ -n "$fix" ] || echo 'JS code needs formatting'
|
||||||
|
|
|
@ -73,7 +73,7 @@ add_custom_command(
|
||||||
COMMAND "${CMAKE_COMMAND}" -E copy_directory
|
COMMAND "${CMAKE_COMMAND}" -E copy_directory
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/src" "src"
|
"${CMAKE_CURRENT_SOURCE_DIR}/src" "src"
|
||||||
COMMAND "${NPM}" ci --no-audit --no-fund --no-progress
|
COMMAND "${NPM}" ci --no-audit --no-fund --no-progress
|
||||||
COMMAND "${NPM}" run --silent build
|
COMMAND "${NPM}" run build
|
||||||
DEPENDS
|
DEPENDS
|
||||||
${WEB_SOURCES}
|
${WEB_SOURCES}
|
||||||
${WEB_STYLES}
|
${WEB_STYLES}
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -45,8 +45,7 @@
|
||||||
"terser-webpack-plugin": "~5.3.6",
|
"terser-webpack-plugin": "~5.3.6",
|
||||||
"webpack": "~5.75.0",
|
"webpack": "~5.75.0",
|
||||||
"webpack-bundle-analyzer": "~4.7.0",
|
"webpack-bundle-analyzer": "~4.7.0",
|
||||||
"webpack-cli": "~4.7.2",
|
"webpack-cli": "~4.7.2"
|
||||||
"webpack-dev-server": "~3.10.3"
|
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"lodash.isequal": "~4.5.0"
|
"lodash.isequal": "~4.5.0"
|
||||||
|
|
Loading…
Reference in New Issue