From b488cf26946899c1af53809e27ba62e28259b189 Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Fri, 26 Sep 2025 17:51:40 +0200 Subject: [PATCH 1/3] Use nodejs-wheel to install node --- Makefile | 12 ++++------- .../dependencies/pinned-requirements.txt | 2 +- packages/app/setup.cfg | 1 + pyproject.toml | 2 +- scripts/common_startup.sh | 20 ------------------- 5 files changed, 7 insertions(+), 30 deletions(-) diff --git a/Makefile b/Makefile index 60f7fdf00af1..72f32693e3bd 100644 --- a/Makefile +++ b/Makefile @@ -180,19 +180,15 @@ skip-client: ## Run only the server, skipping the client build. node-deps: ## Install NodeJS dependencies. ifndef YARN - @echo $(NO_YARN_MSG) - false; -else - $(IN_VENV) yarn install $(YARN_INSTALL_OPTS) + npm install -g yarn; endif + $(IN_VENV) yarn install $(YARN_INSTALL_OPTS) client-node-deps: ## Install NodeJS dependencies for the client. ifndef YARN - @echo $(NO_YARN_MSG) - false; -else - $(IN_VENV) cd client && yarn install $(YARN_INSTALL_OPTS) + npm install -g yarn; endif + $(IN_VENV) cd client && yarn install $(YARN_INSTALL_OPTS) format-xsd: xmllint --format --output galaxy-tmp.xsd lib/galaxy/tool_util/xsd/galaxy.xsd diff --git a/lib/galaxy/dependencies/pinned-requirements.txt b/lib/galaxy/dependencies/pinned-requirements.txt index 8c7c23a7263d..80ded94856d6 100644 --- a/lib/galaxy/dependencies/pinned-requirements.txt +++ b/lib/galaxy/dependencies/pinned-requirements.txt @@ -124,7 +124,7 @@ mypy-extensions==1.1.0 networkx==3.2.1 ; python_full_version < '3.10' networkx==3.4.2 ; python_full_version == '3.10.*' networkx==3.5 ; python_full_version >= '3.11' -nodeenv==1.9.1 +nodejs-wheel==22.13.0 numpy==2.0.2 ; python_full_version < '3.10' numpy==2.2.6 ; python_full_version == '3.10.*' numpy==2.3.3 ; python_full_version >= '3.11' diff --git a/packages/app/setup.cfg b/packages/app/setup.cfg index 262815fa8435..f3052a51f41d 100644 --- a/packages/app/setup.cfg +++ b/packages/app/setup.cfg @@ -60,6 +60,7 @@ install_requires = Markdown MarkupSafe mercurial>=6.8.2 + nodejs-wheel==22.13.0 packaging paramiko!=2.9.0,!=2.9.1 pebble diff --git a/pyproject.toml b/pyproject.toml index 316fa1abee7c..ec841b0eb0e6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -60,7 +60,7 @@ dependencies = [ "mercurial>=6.8.2", # Python 3.13 support "mrcfile", "msal", - "nodeenv", + "nodejs-wheel==22.13.0", # track client/.node_version "numpy>=1.26.0", # Python 3.12 support "numpy>=2.1.0 ; python_version>='3.10'", # Python 3.13 support "openpyxl>=3.1.5", # Minimum version ever tested with diff --git a/scripts/common_startup.sh b/scripts/common_startup.sh index b951cfb94812..9770d6243d61 100755 --- a/scripts/common_startup.sh +++ b/scripts/common_startup.sh @@ -10,9 +10,7 @@ CREATE_VENV=1 COPY_SAMPLE_FILES=1 SET_VENV=1 SKIP_CLIENT_BUILD=${GALAXY_SKIP_CLIENT_BUILD:-0} -SKIP_NODE=${GALAXY_SKIP_NODE:-0} INSTALL_PREBUILT_CLIENT=${GALAXY_INSTALL_PREBUILT_CLIENT:-0} -NODE_VERSION=${GALAXY_NODE_VERSION:-"$(cat client/.node_version)"} : "${YARN_INSTALL_OPTS:=--network-timeout 300000 --check-files}" : "${GALAXY_CONDA_PYTHON_VERSION:=3.9}" @@ -28,7 +26,6 @@ for arg in "$@"; do [ "$arg" = "--stop-daemon" ] && FETCH_WHEELS=0 [ "$arg" = "--skip-samples" ] && COPY_SAMPLE_FILES=0 [ "$arg" = "--skip-client-build" ] && SKIP_CLIENT_BUILD=1 - [ "$arg" = "--skip-node" ] && SKIP_NODE=1 done SAMPLES=" @@ -198,23 +195,6 @@ if [ $FETCH_WHEELS -eq 1 ]; then fi fi -# Install node if not installed -if [ $SKIP_NODE -eq 0 ]; then - if ! command -v node >/dev/null || [ "$(node --version)" != "v${NODE_VERSION}" ]; then - if [ -n "$CONDA_DEFAULT_ENV" ] && [ -n "$CONDA_EXE" ]; then - echo "Installing node into '$CONDA_DEFAULT_ENV' Conda environment with conda." - $CONDA_EXE install --yes --override-channels --channel conda-forge --name "$CONDA_DEFAULT_ENV" nodejs="$NODE_VERSION" - elif [ -n "$VIRTUAL_ENV" ]; then - echo "Installing node into $VIRTUAL_ENV with nodeenv." - if [ -d "${VIRTUAL_ENV}/lib/node_modules" ]; then - echo "Removing old ${VIRTUAL_ENV}/lib/node_modules directory." - rm -rf "${VIRTUAL_ENV}/lib/node_modules" - fi - nodeenv -n "$NODE_VERSION" -p - fi - fi -fi - # Check client build state. if [ $SKIP_CLIENT_BUILD -eq 0 ]; then if [ -f static/client_build_hash.txt ]; then From 38a7d23fbc54b87fe908483bbc3f513cd1143af8 Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Sat, 27 Sep 2025 09:16:26 +0200 Subject: [PATCH 2/3] Drop setup-node action where possible Where we still use the action we don't install python dependencies. --- .github/workflows/api.yaml | 5 ----- .github/workflows/converter_tests.yaml | 5 ----- .github/workflows/cwl_conformance.yaml | 5 ----- .github/workflows/first_startup.yaml | 5 ----- .github/workflows/framework_tools.yaml | 5 ----- .github/workflows/framework_workflows.yaml | 5 ----- .github/workflows/integration.yaml | 5 ----- .github/workflows/integration_selenium.yaml | 5 ----- .github/workflows/main_tools.yaml | 5 ----- .github/workflows/osx_startup.yaml | 5 ----- .github/workflows/performance.yaml | 5 ----- .github/workflows/reports_startup.yaml | 5 ----- .github/workflows/selenium.yaml | 5 ----- .github/workflows/test_galaxy_packages.yaml | 5 ----- .github/workflows/toolshed.yaml | 5 ----- .github/workflows/unit-postgres.yaml | 5 ----- .github/workflows/unit.yaml | 5 ----- packages/app/setup.cfg | 2 +- pyproject.toml | 2 +- 19 files changed, 2 insertions(+), 87 deletions(-) diff --git a/.github/workflows/api.yaml b/.github/workflows/api.yaml index af1b55c112f3..b8a7770725f0 100644 --- a/.github/workflows/api.yaml +++ b/.github/workflows/api.yaml @@ -54,11 +54,6 @@ jobs: - name: Read Node.js version id: node-version run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT - - uses: actions/setup-node@v5 - with: - node-version: ${{ steps.node-version.outputs.version }} - cache: 'yarn' - cache-dependency-path: 'galaxy root/client/yarn.lock' - uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/converter_tests.yaml b/.github/workflows/converter_tests.yaml index cf0c4cefc1af..a3a63ad8e43b 100644 --- a/.github/workflows/converter_tests.yaml +++ b/.github/workflows/converter_tests.yaml @@ -37,11 +37,6 @@ jobs: - name: Read Node.js version id: node-version run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT - - uses: actions/setup-node@v5 - with: - node-version: ${{ steps.node-version.outputs.version }} - cache: 'yarn' - cache-dependency-path: 'galaxy root/client/yarn.lock' - name: Clone galaxyproject/galaxy-test-data uses: actions/checkout@v5 with: diff --git a/.github/workflows/cwl_conformance.yaml b/.github/workflows/cwl_conformance.yaml index 116164403c00..6bf487d329d6 100644 --- a/.github/workflows/cwl_conformance.yaml +++ b/.github/workflows/cwl_conformance.yaml @@ -46,11 +46,6 @@ jobs: - name: Read Node.js version id: node-version run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT - - uses: actions/setup-node@v5 - with: - node-version: ${{ steps.node-version.outputs.version }} - cache: 'yarn' - cache-dependency-path: 'galaxy root/client/yarn.lock' - uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/first_startup.yaml b/.github/workflows/first_startup.yaml index 212e078668df..872628221770 100644 --- a/.github/workflows/first_startup.yaml +++ b/.github/workflows/first_startup.yaml @@ -37,11 +37,6 @@ jobs: - name: Read Node.js version id: node-version run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT - - uses: actions/setup-node@v5 - with: - node-version: ${{ steps.node-version.outputs.version }} - cache: 'yarn' - cache-dependency-path: 'galaxy root/client/yarn.lock' - name: Set up Python uses: actions/setup-python@v6 with: diff --git a/.github/workflows/framework_tools.yaml b/.github/workflows/framework_tools.yaml index c347b33f91a0..f7f89e0335bc 100644 --- a/.github/workflows/framework_tools.yaml +++ b/.github/workflows/framework_tools.yaml @@ -49,11 +49,6 @@ jobs: - name: Read Node.js version id: node-version run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT - - uses: actions/setup-node@v5 - with: - node-version: ${{ steps.node-version.outputs.version }} - cache: 'yarn' - cache-dependency-path: 'galaxy root/client/yarn.lock' - uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/framework_workflows.yaml b/.github/workflows/framework_workflows.yaml index 160658029d6a..d84971547400 100644 --- a/.github/workflows/framework_workflows.yaml +++ b/.github/workflows/framework_workflows.yaml @@ -50,11 +50,6 @@ jobs: - name: Read Node.js version id: node-version run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT - - uses: actions/setup-node@v5 - with: - node-version: ${{ steps.node-version.outputs.version }} - cache: 'yarn' - cache-dependency-path: 'galaxy root/client/yarn.lock' - uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml index ca576b47a8ac..64ec7bb48d3d 100644 --- a/.github/workflows/integration.yaml +++ b/.github/workflows/integration.yaml @@ -58,11 +58,6 @@ jobs: - name: Read Node.js version id: node-version run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT - - uses: actions/setup-node@v5 - with: - node-version: ${{ steps.node-version.outputs.version }} - cache: 'yarn' - cache-dependency-path: 'galaxy root/client/yarn.lock' - uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/integration_selenium.yaml b/.github/workflows/integration_selenium.yaml index b008525e7e57..c6b91eeb3ddf 100644 --- a/.github/workflows/integration_selenium.yaml +++ b/.github/workflows/integration_selenium.yaml @@ -71,11 +71,6 @@ jobs: - name: Read Node.js version id: node-version run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT - - uses: actions/setup-node@v5 - with: - node-version: ${{ steps.node-version.outputs.version }} - cache: 'yarn' - cache-dependency-path: 'galaxy root/client/yarn.lock' - name: Restore client cache uses: actions/cache@v4 with: diff --git a/.github/workflows/main_tools.yaml b/.github/workflows/main_tools.yaml index b68a76fde437..9e2dd4a62ae1 100644 --- a/.github/workflows/main_tools.yaml +++ b/.github/workflows/main_tools.yaml @@ -42,11 +42,6 @@ jobs: - name: Read Node.js version id: node-version run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT - - uses: actions/setup-node@v5 - with: - node-version: ${{ steps.node-version.outputs.version }} - cache: 'yarn' - cache-dependency-path: 'galaxy root/client/yarn.lock' - uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/osx_startup.yaml b/.github/workflows/osx_startup.yaml index 883f94450a4a..66b463ef4059 100644 --- a/.github/workflows/osx_startup.yaml +++ b/.github/workflows/osx_startup.yaml @@ -35,11 +35,6 @@ jobs: - name: Read Node.js version id: node-version run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT - - uses: actions/setup-node@v5 - with: - node-version: ${{ steps.node-version.outputs.version }} - cache: 'yarn' - cache-dependency-path: 'galaxy root/client/yarn.lock' - name: Cache pip dir uses: actions/cache@v4 with: diff --git a/.github/workflows/performance.yaml b/.github/workflows/performance.yaml index b90ff8eeae4e..d164f57454a5 100644 --- a/.github/workflows/performance.yaml +++ b/.github/workflows/performance.yaml @@ -48,11 +48,6 @@ jobs: - name: Read Node.js version id: node-version run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT - - uses: actions/setup-node@v5 - with: - node-version: ${{ steps.node-version.outputs.version }} - cache: 'yarn' - cache-dependency-path: 'galaxy root/client/yarn.lock' - uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/reports_startup.yaml b/.github/workflows/reports_startup.yaml index e99182ba6171..5e7a3160412b 100644 --- a/.github/workflows/reports_startup.yaml +++ b/.github/workflows/reports_startup.yaml @@ -32,11 +32,6 @@ jobs: - name: Read Node.js version id: node-version run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT - - uses: actions/setup-node@v5 - with: - node-version: ${{ steps.node-version.outputs.version }} - cache: 'yarn' - cache-dependency-path: 'galaxy root/client/yarn.lock' - name: Set up Python uses: actions/setup-python@v6 with: diff --git a/.github/workflows/selenium.yaml b/.github/workflows/selenium.yaml index 382c6ca4deba..ed841d71fdcd 100644 --- a/.github/workflows/selenium.yaml +++ b/.github/workflows/selenium.yaml @@ -57,11 +57,6 @@ jobs: - name: Read Node.js version id: node-version run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT - - uses: actions/setup-node@v5 - with: - node-version: ${{ steps.node-version.outputs.version }} - cache: 'yarn' - cache-dependency-path: 'galaxy root/client/yarn.lock' - uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/test_galaxy_packages.yaml b/.github/workflows/test_galaxy_packages.yaml index e0e87096c853..93f56e2cdf51 100644 --- a/.github/workflows/test_galaxy_packages.yaml +++ b/.github/workflows/test_galaxy_packages.yaml @@ -27,11 +27,6 @@ jobs: - name: Read Node.js version id: node-version run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT - - uses: actions/setup-node@v5 - with: - node-version: ${{ steps.node-version.outputs.version }} - cache: 'yarn' - cache-dependency-path: 'galaxy root/client/yarn.lock' - uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/toolshed.yaml b/.github/workflows/toolshed.yaml index bc736d21ee20..35bf8b21f93f 100644 --- a/.github/workflows/toolshed.yaml +++ b/.github/workflows/toolshed.yaml @@ -43,11 +43,6 @@ jobs: - name: Read Node.js version id: node-version run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT - - uses: actions/setup-node@v5 - with: - node-version: ${{ steps.node-version.outputs.version }} - cache: 'yarn' - cache-dependency-path: 'galaxy root/client/yarn.lock' - uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/unit-postgres.yaml b/.github/workflows/unit-postgres.yaml index 73a06059d9d8..b5ab175196d4 100644 --- a/.github/workflows/unit-postgres.yaml +++ b/.github/workflows/unit-postgres.yaml @@ -42,11 +42,6 @@ jobs: - name: Read Node.js version id: node-version run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT - - uses: actions/setup-node@v5 - with: - node-version: ${{ steps.node-version.outputs.version }} - cache: 'yarn' - cache-dependency-path: 'galaxy root/client/yarn.lock' - uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml index 5b57d57b84be..84ab58f8b25b 100644 --- a/.github/workflows/unit.yaml +++ b/.github/workflows/unit.yaml @@ -31,11 +31,6 @@ jobs: - name: Read Node.js version id: node-version run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT - - uses: actions/setup-node@v5 - with: - node-version: ${{ steps.node-version.outputs.version }} - cache: 'yarn' - cache-dependency-path: 'galaxy root/client/yarn.lock' - uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} diff --git a/packages/app/setup.cfg b/packages/app/setup.cfg index f3052a51f41d..c6c6ef4bfa75 100644 --- a/packages/app/setup.cfg +++ b/packages/app/setup.cfg @@ -60,7 +60,7 @@ install_requires = Markdown MarkupSafe mercurial>=6.8.2 - nodejs-wheel==22.13.0 + nodejs-wheel>=22,<23 packaging paramiko!=2.9.0,!=2.9.1 pebble diff --git a/pyproject.toml b/pyproject.toml index ec841b0eb0e6..44929dbbefe0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -60,7 +60,7 @@ dependencies = [ "mercurial>=6.8.2", # Python 3.13 support "mrcfile", "msal", - "nodejs-wheel==22.13.0", # track client/.node_version + "nodejs-wheel==22", "numpy>=1.26.0", # Python 3.12 support "numpy>=2.1.0 ; python_version>='3.10'", # Python 3.13 support "openpyxl>=3.1.5", # Minimum version ever tested with From d52c0c2b195977c3ac90b958ac491cec1e3b5bfa Mon Sep 17 00:00:00 2001 From: Marius van den Beek Date: Mon, 29 Sep 2025 17:11:28 +0200 Subject: [PATCH 3/3] Drop read node.js version step Co-authored-by: Nicola Soranzo --- .github/workflows/api.yaml | 3 --- .github/workflows/converter_tests.yaml | 3 --- .github/workflows/cwl_conformance.yaml | 3 --- .github/workflows/first_startup.yaml | 3 --- .github/workflows/framework_tools.yaml | 3 --- .github/workflows/framework_workflows.yaml | 3 --- .github/workflows/integration.yaml | 3 --- .github/workflows/integration_selenium.yaml | 3 --- .github/workflows/main_tools.yaml | 3 --- .github/workflows/osx_startup.yaml | 3 --- .github/workflows/performance.yaml | 3 --- .github/workflows/reports_startup.yaml | 3 --- .github/workflows/selenium.yaml | 3 --- .github/workflows/test_galaxy_packages.yaml | 3 --- .github/workflows/toolshed.yaml | 3 --- .github/workflows/unit-postgres.yaml | 3 --- .github/workflows/unit.yaml | 3 --- 17 files changed, 51 deletions(-) diff --git a/.github/workflows/api.yaml b/.github/workflows/api.yaml index b8a7770725f0..3005df3cb603 100644 --- a/.github/workflows/api.yaml +++ b/.github/workflows/api.yaml @@ -51,9 +51,6 @@ jobs: with: path: 'galaxy root' persist-credentials: false - - name: Read Node.js version - id: node-version - run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT - uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/converter_tests.yaml b/.github/workflows/converter_tests.yaml index a3a63ad8e43b..e4fb8051f86e 100644 --- a/.github/workflows/converter_tests.yaml +++ b/.github/workflows/converter_tests.yaml @@ -34,9 +34,6 @@ jobs: with: path: 'galaxy root' persist-credentials: false - - name: Read Node.js version - id: node-version - run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT - name: Clone galaxyproject/galaxy-test-data uses: actions/checkout@v5 with: diff --git a/.github/workflows/cwl_conformance.yaml b/.github/workflows/cwl_conformance.yaml index 6bf487d329d6..c14f724e03ff 100644 --- a/.github/workflows/cwl_conformance.yaml +++ b/.github/workflows/cwl_conformance.yaml @@ -43,9 +43,6 @@ jobs: with: path: 'galaxy root' persist-credentials: false - - name: Read Node.js version - id: node-version - run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT - uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/first_startup.yaml b/.github/workflows/first_startup.yaml index 872628221770..c45df624d81a 100644 --- a/.github/workflows/first_startup.yaml +++ b/.github/workflows/first_startup.yaml @@ -34,9 +34,6 @@ jobs: with: path: 'galaxy root' persist-credentials: false - - name: Read Node.js version - id: node-version - run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT - name: Set up Python uses: actions/setup-python@v6 with: diff --git a/.github/workflows/framework_tools.yaml b/.github/workflows/framework_tools.yaml index f7f89e0335bc..edc415b3d168 100644 --- a/.github/workflows/framework_tools.yaml +++ b/.github/workflows/framework_tools.yaml @@ -46,9 +46,6 @@ jobs: with: path: 'galaxy root' persist-credentials: false - - name: Read Node.js version - id: node-version - run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT - uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/framework_workflows.yaml b/.github/workflows/framework_workflows.yaml index d84971547400..375c0dafef35 100644 --- a/.github/workflows/framework_workflows.yaml +++ b/.github/workflows/framework_workflows.yaml @@ -47,9 +47,6 @@ jobs: with: path: 'galaxy root' persist-credentials: false - - name: Read Node.js version - id: node-version - run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT - uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml index 64ec7bb48d3d..7cc13b2ea5bc 100644 --- a/.github/workflows/integration.yaml +++ b/.github/workflows/integration.yaml @@ -55,9 +55,6 @@ jobs: with: path: 'galaxy root' persist-credentials: false - - name: Read Node.js version - id: node-version - run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT - uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/integration_selenium.yaml b/.github/workflows/integration_selenium.yaml index c6b91eeb3ddf..27ba24dc0f8d 100644 --- a/.github/workflows/integration_selenium.yaml +++ b/.github/workflows/integration_selenium.yaml @@ -68,9 +68,6 @@ jobs: with: path: 'galaxy root/.venv' key: gxy-venv-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('galaxy root/requirements.txt') }}-integration-selenium - - name: Read Node.js version - id: node-version - run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT - name: Restore client cache uses: actions/cache@v4 with: diff --git a/.github/workflows/main_tools.yaml b/.github/workflows/main_tools.yaml index 9e2dd4a62ae1..00646929d7b4 100644 --- a/.github/workflows/main_tools.yaml +++ b/.github/workflows/main_tools.yaml @@ -39,9 +39,6 @@ jobs: with: path: 'galaxy root' persist-credentials: false - - name: Read Node.js version - id: node-version - run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT - uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/osx_startup.yaml b/.github/workflows/osx_startup.yaml index 66b463ef4059..46cea3511416 100644 --- a/.github/workflows/osx_startup.yaml +++ b/.github/workflows/osx_startup.yaml @@ -32,9 +32,6 @@ jobs: with: path: 'galaxy root' persist-credentials: false - - name: Read Node.js version - id: node-version - run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT - name: Cache pip dir uses: actions/cache@v4 with: diff --git a/.github/workflows/performance.yaml b/.github/workflows/performance.yaml index d164f57454a5..47551a865214 100644 --- a/.github/workflows/performance.yaml +++ b/.github/workflows/performance.yaml @@ -45,9 +45,6 @@ jobs: with: path: 'galaxy root' persist-credentials: false - - name: Read Node.js version - id: node-version - run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT - uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/reports_startup.yaml b/.github/workflows/reports_startup.yaml index 5e7a3160412b..f3f9b0f85732 100644 --- a/.github/workflows/reports_startup.yaml +++ b/.github/workflows/reports_startup.yaml @@ -29,9 +29,6 @@ jobs: with: path: 'galaxy root' persist-credentials: false - - name: Read Node.js version - id: node-version - run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT - name: Set up Python uses: actions/setup-python@v6 with: diff --git a/.github/workflows/selenium.yaml b/.github/workflows/selenium.yaml index ed841d71fdcd..8d2fc7016dab 100644 --- a/.github/workflows/selenium.yaml +++ b/.github/workflows/selenium.yaml @@ -54,9 +54,6 @@ jobs: with: path: 'galaxy root' persist-credentials: false - - name: Read Node.js version - id: node-version - run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT - uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/test_galaxy_packages.yaml b/.github/workflows/test_galaxy_packages.yaml index 93f56e2cdf51..c928c51a3d6b 100644 --- a/.github/workflows/test_galaxy_packages.yaml +++ b/.github/workflows/test_galaxy_packages.yaml @@ -24,9 +24,6 @@ jobs: with: path: 'galaxy root' persist-credentials: false - - name: Read Node.js version - id: node-version - run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT - uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/toolshed.yaml b/.github/workflows/toolshed.yaml index 35bf8b21f93f..e3ee589e628a 100644 --- a/.github/workflows/toolshed.yaml +++ b/.github/workflows/toolshed.yaml @@ -40,9 +40,6 @@ jobs: with: path: 'galaxy root' persist-credentials: false - - name: Read Node.js version - id: node-version - run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT - uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/unit-postgres.yaml b/.github/workflows/unit-postgres.yaml index b5ab175196d4..f811de120f0c 100644 --- a/.github/workflows/unit-postgres.yaml +++ b/.github/workflows/unit-postgres.yaml @@ -39,9 +39,6 @@ jobs: with: path: 'galaxy root' persist-credentials: false - - name: Read Node.js version - id: node-version - run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT - uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml index 84ab58f8b25b..3d711dc6715e 100644 --- a/.github/workflows/unit.yaml +++ b/.github/workflows/unit.yaml @@ -28,9 +28,6 @@ jobs: with: path: 'galaxy root' persist-credentials: false - - name: Read Node.js version - id: node-version - run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT - uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }}