mirror of
https://github.com/transmission/transmission
synced 2024-12-21 23:32:35 +00:00
fix: CI errors related to REBUILD_WEB
(#7252)
* ci: bump debian image from 11 to 12 debian 11 has npm 7.5.2, which is lower than our minimum required version 8.0.307. * build: find `npm.cmd` on Windows * chore: trigger CI * Revert "chore: trigger CI" This reverts commitadc8f4ec98
. * Revert "ci: bump debian image from 11 to 12" This reverts commit4730d350b3
. * ci: use `actions/setup-node` in debian 11 * ci: don't test `REBUILD_WEB` if only `libtransmission` changed * ci: don't test `REBUILD_WEB` if only `third-party` changed
This commit is contained in:
parent
1074c30e60
commit
27955a9c8a
2 changed files with 11 additions and 3 deletions
7
.github/workflows/actions.yml
vendored
7
.github/workflows/actions.yml
vendored
|
@ -66,7 +66,7 @@ jobs:
|
|||
get_changes qt CMakeLists.txt cmake third-party libtransmission qt
|
||||
get_changes tests CMakeLists.txt cmake third-party libtransmission utils tests
|
||||
get_changes utils CMakeLists.txt cmake third-party libtransmission utils
|
||||
get_changes web CMakeLists.txt cmake third-party libtransmission web
|
||||
get_changes web CMakeLists.txt cmake web
|
||||
get_changes ci-actions .github/workflows/actions.yml
|
||||
cat "$GITHUB_OUTPUT"
|
||||
|
||||
|
@ -835,9 +835,12 @@ jobs:
|
|||
libpsl-dev \
|
||||
libssl-dev \
|
||||
ninja-build \
|
||||
npm \
|
||||
pkg-config \
|
||||
xz-utils
|
||||
- name: Get NPM
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: lts/*
|
||||
- name: Get Dependencies (GTK)
|
||||
if: ${{ needs.what-to-make.outputs.make-gtk == 'true' }}
|
||||
run: apt-get install -y --no-install-recommends libglibmm-2.4-dev libgtkmm-3.0-dev
|
||||
|
|
|
@ -557,7 +557,12 @@ set(TR_WEB_ASSETS ${PROJECT_SOURCE_DIR}/web/public_html)
|
|||
if(REBUILD_WEB)
|
||||
tr_get_required_flag(REBUILD_WEB NPM_IS_REQUIRED)
|
||||
|
||||
find_program(NPM npm)
|
||||
if(WIN32)
|
||||
find_program(NPM npm.cmd)
|
||||
else()
|
||||
find_program(NPM npm)
|
||||
endif()
|
||||
|
||||
if ("${NPM}" STREQUAL "NPM-NOTFOUND")
|
||||
set(NPM_FOUND OFF)
|
||||
if(NPM_IS_REQUIRED)
|
||||
|
|
Loading…
Reference in a new issue