Skip to content

Commit c6988fd

Browse files
build(web-ui): commit lock file (#5083)
1 parent 888a6bb commit c6988fd

5 files changed

Lines changed: 3039 additions & 16 deletions

File tree

.github/workflows/ci-bundle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
2323

2424
- name: Install npm dependencies
25-
run: npm install --ignore-scripts
25+
run: npm ci --ignore-scripts
2626

2727
- name: Debug install
2828
if: always()

.github/workflows/ci-flatpak.yml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,6 @@ jobs:
4444
with:
4545
submodules: recursive
4646

47-
- name: Setup node
48-
id: node
49-
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
50-
with:
51-
node-version: ${{ env.NODE_VERSION }}
52-
53-
- name: Install npm dependencies
54-
run: npm install --ignore-scripts --package-lock-only
55-
56-
- name: Debug package-lock.json
57-
run: cat package-lock.json
58-
5947
- name: Setup python
6048
id: python
6149
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
@@ -209,9 +197,9 @@ jobs:
209197
mkdir -p flathub/modules
210198
cp "./build/generated-sources.json" "./flathub/"
211199
cp "./build/glad-dependencies.json" "./flathub/"
212-
cp "./build/package-lock.json" "./flathub/"
213200
cp "./build/${APP_ID}.yml" "./flathub/"
214201
cp "./build/${APP_ID}.metainfo.xml" "./flathub/"
202+
cp "./package-lock.json" "./flathub/"
215203
cp "./packaging/linux/flatpak/README.md" "./flathub/"
216204
cp "./packaging/linux/flatpak/flathub.json" "./flathub/"
217205
cp -r "./packaging/linux/flatpak/modules/." "./flathub/modules/"

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ docs/doxyconfig*
4444

4545
# npm
4646
node_modules/
47-
package-lock.json
4847

4948
# Translations
5049
*.mo

cmake/targets/common.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ endif()
6464
add_custom_target(web-ui ALL
6565
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
6666
COMMENT "Installing NPM Dependencies and Building the Web UI"
67-
COMMAND "$<$<BOOL:${WIN32}>:cmd;/C>" "${NPM}" install ${NPM_INSTALL_FLAGS}
67+
COMMAND "$<$<BOOL:${WIN32}>:cmd;/C>" "${NPM}" ci ${NPM_INSTALL_FLAGS}
6868
COMMAND "${CMAKE_COMMAND}" -E env "SUNSHINE_BUILD_HOMEBREW=${NPM_BUILD_HOMEBREW}" "SUNSHINE_SOURCE_ASSETS_DIR=${NPM_SOURCE_ASSETS_DIR}" "SUNSHINE_ASSETS_DIR=${NPM_ASSETS_DIR}" "$<$<BOOL:${WIN32}>:cmd;/C>" "${NPM}" run build # cmake-lint: disable=C0301
6969
COMMAND_EXPAND_LISTS
7070
VERBATIM)

0 commit comments

Comments
 (0)