mirror of
https://github.com/transmission/transmission.git
synced 2025-12-20 02:18:42 +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 commit adc8f4ec981c94c4eab3c1499ea0c555f554a1d2. * Revert "ci: bump debian image from 11 to 12" This reverts commit 4730d350b3789ec8ab750ff57e713a59c3389831. * 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:
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 qt CMakeLists.txt cmake third-party libtransmission qt
|
||||||
get_changes tests CMakeLists.txt cmake third-party libtransmission utils tests
|
get_changes tests CMakeLists.txt cmake third-party libtransmission utils tests
|
||||||
get_changes utils CMakeLists.txt cmake third-party libtransmission utils
|
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
|
get_changes ci-actions .github/workflows/actions.yml
|
||||||
cat "$GITHUB_OUTPUT"
|
cat "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
@@ -835,9 +835,12 @@ jobs:
|
|||||||
libpsl-dev \
|
libpsl-dev \
|
||||||
libssl-dev \
|
libssl-dev \
|
||||||
ninja-build \
|
ninja-build \
|
||||||
npm \
|
|
||||||
pkg-config \
|
pkg-config \
|
||||||
xz-utils
|
xz-utils
|
||||||
|
- name: Get NPM
|
||||||
|
uses: actions/setup-node@v4
|
||||||
|
with:
|
||||||
|
node-version: lts/*
|
||||||
- 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' }}
|
||||||
run: apt-get install -y --no-install-recommends libglibmm-2.4-dev libgtkmm-3.0-dev
|
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)
|
if(REBUILD_WEB)
|
||||||
tr_get_required_flag(REBUILD_WEB NPM_IS_REQUIRED)
|
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")
|
if ("${NPM}" STREQUAL "NPM-NOTFOUND")
|
||||||
set(NPM_FOUND OFF)
|
set(NPM_FOUND OFF)
|
||||||
if(NPM_IS_REQUIRED)
|
if(NPM_IS_REQUIRED)
|
||||||
|
|||||||
Reference in New Issue
Block a user