Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade bundled/requested node version to 22.13.0 #18710

Draft
wants to merge 18 commits into
base: dev
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions .github/setup-node/action.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: 'Setup Node.js'
description: 'Sets up Node.js and installs dependencies'
inputs:
node-version:
description: 'The Node.js version to use'
required: false
default: '22.13.1'
cache:
description: 'Whether to cache dependencies'
required: false
default: 'yarn'
cache-dependency-path:
description: 'The path to the dependency file to cache'
required: false
default: './client/yarn.lock'
runs:
using: "composite"
steps:
- name: Set up Node.js
uses: actions/setup-node@v4
with:
node-version: ${{ inputs.node-version }}
cache: ${{ inputs.cache }}
cache-dependency-path: ${{ inputs.cache-dependency-path }}
6 changes: 1 addition & 5 deletions .github/workflows/api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,7 @@ jobs:
- uses: actions/checkout@v4
with:
path: 'galaxy root'
- uses: actions/setup-node@v4
with:
node-version: '18.12.1'
cache: 'yarn'
cache-dependency-path: 'galaxy root/client/yarn.lock'
- uses: ../.github/setup-node/
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
Expand Down
14 changes: 5 additions & 9 deletions .github/workflows/build_client.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,22 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
path: 'galaxy root'
- uses: actions/setup-node@v4
with:
node-version: '18.12.1'
cache: 'yarn'
cache-dependency-path: 'galaxy root/client/yarn.lock'
path: 'galaxy-root'
- uses: ./galaxy-root/.github/setup-node
- name: get client commit
id: client-commit
shell: bash
run: echo "commit=$(git rev-parse HEAD 2>/dev/null)" >> $GITHUB_OUTPUT
working-directory: 'galaxy root'
working-directory: 'galaxy-root'
- name: cache client build
uses: actions/cache@v4
id: cache
with:
key: galaxy-static-${{ steps.client-commit.outputs.commit }}
path: 'galaxy root/static'
path: 'galaxy-root/static'
- name: Build client
if: steps.cache.outputs.cache-hit != 'true'
env:
GALAXY_PLUGIN_BUILD_FAIL_ON_ERROR: 1
run: make client
working-directory: 'galaxy root'
working-directory: 'galaxy-root'
6 changes: 1 addition & 5 deletions .github/workflows/converter_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,7 @@ jobs:
- uses: actions/checkout@v4
with:
path: 'galaxy root'
- uses: actions/setup-node@v4
with:
node-version: '18.12.1'
cache: 'yarn'
cache-dependency-path: 'galaxy root/client/yarn.lock'
- uses: ./.github/setup-node/
- name: Clone galaxyproject/galaxy-test-data
uses: actions/checkout@v4
with:
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/cwl_conformance.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,7 @@ jobs:
- uses: actions/checkout@v4
with:
path: 'galaxy root'
- uses: actions/setup-node@v4
with:
node-version: '18.12.1'
cache: 'yarn'
cache-dependency-path: 'galaxy root/client/yarn.lock'
- uses: ./.github/setup-node/
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/first_startup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,7 @@ jobs:
- uses: actions/checkout@v4
with:
path: 'galaxy root'
- uses: actions/setup-node@v4
with:
node-version: '18.12.1'
cache: 'yarn'
cache-dependency-path: 'galaxy root/client/yarn.lock'
- uses: ./.github/setup-node/
- name: Set up Python
uses: actions/setup-python@v5
with:
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/framework_tools.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,7 @@ jobs:
- uses: actions/checkout@v4
with:
path: 'galaxy root'
- uses: actions/setup-node@v4
with:
node-version: '18.12.1'
cache: 'yarn'
cache-dependency-path: 'galaxy root/client/yarn.lock'
- uses: ./.github/setup-node/
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/framework_workflows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,7 @@ jobs:
- uses: actions/checkout@v4
with:
path: 'galaxy root'
- uses: actions/setup-node@v4
with:
node-version: '18.12.1'
cache: 'yarn'
cache-dependency-path: 'galaxy root/client/yarn.lock'
- uses: ./.github/setup-node/
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,7 @@ jobs:
- uses: actions/checkout@v4
with:
path: 'galaxy root'
- uses: actions/setup-node@v4
with:
node-version: '18.12.1'
cache: 'yarn'
cache-dependency-path: 'galaxy root/client/yarn.lock'
- uses: ./.github/setup-node/
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/integration_selenium.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,7 @@ jobs:
with:
path: 'galaxy root/.venv'
key: gxy-venv-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('galaxy root/requirements.txt') }}-integration-selenium
- uses: actions/setup-node@v4
with:
node-version: '18.12.1'
cache: 'yarn'
cache-dependency-path: 'galaxy root/client/yarn.lock'
- uses: ./.github/setup-node/
- name: Restore client cache
uses: actions/cache@v4
with:
Expand Down
9 changes: 1 addition & 8 deletions .github/workflows/jest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,10 @@ concurrency:
jobs:
client-unit-test:
runs-on: ubuntu-latest
strategy:
matrix:
node: [18]
steps:
- uses: actions/checkout@v4
- name: Setup node
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node}}
cache: 'yarn'
cache-dependency-path: 'client/yarn.lock'
uses: ./.github/setup-node/
- run: yarn install --frozen-lockfile
working-directory: client
- name: Stage client libs (Gulp)
Expand Down
10 changes: 1 addition & 9 deletions .github/workflows/js_lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,9 @@ concurrency:
jobs:
client-unit-test:
runs-on: ubuntu-latest
strategy:
matrix:
node: [18]
steps:
- uses: actions/checkout@v4
- name: Setup node
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node}}
cache: 'yarn'
cache-dependency-path: 'client/yarn.lock'
- uses: ./.github/setup-node/
- run: yarn install --frozen-lockfile
working-directory: client
- name: Run ESLint
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/lint_openapi_schema.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,7 @@ jobs:
- uses: actions/checkout@v4
with:
path: 'galaxy root'
- uses: actions/setup-node@v4
with:
node-version: '18.12.1'
cache: 'yarn'
cache-dependency-path: 'galaxy root/client/yarn.lock'
- uses: ./.github/setup-node/
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/osx_startup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,7 @@ jobs:
- uses: actions/checkout@v4
with:
path: 'galaxy root'
- uses: actions/setup-node@v4
with:
node-version: '18.12.1'
cache: 'yarn'
cache-dependency-path: 'galaxy root/client/yarn.lock'
- uses: ./.github/setup-node/
- name: Cache pip dir
uses: actions/cache@v4
with:
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/performance.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,7 @@ jobs:
- uses: actions/checkout@v4
with:
path: 'galaxy root'
- uses: actions/setup-node@v4
with:
node-version: '18.12.1'
cache: 'yarn'
cache-dependency-path: 'galaxy root/client/yarn.lock'
- uses: ./.github/setup-node/
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/reports_startup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,7 @@ jobs:
- uses: actions/checkout@v4
with:
path: 'galaxy root'
- uses: actions/setup-node@v4
with:
node-version: '18.12.1'
cache: 'yarn'
cache-dependency-path: 'galaxy root/client/yarn.lock'
- uses: ./.github/setup-node/
- name: Set up Python
uses: actions/setup-python@v5
with:
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/selenium.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,7 @@ jobs:
- uses: actions/checkout@v4
with:
path: 'galaxy root'
- uses: actions/setup-node@v4
with:
node-version: '18.12.1'
cache: 'yarn'
cache-dependency-path: 'galaxy root/client/yarn.lock'
- uses: ./.github/setup-node/
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/test_galaxy_packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,7 @@ jobs:
- uses: actions/checkout@v4
with:
path: 'galaxy root'
- uses: actions/setup-node@v4
with:
node-version: '18.12.1'
cache: 'yarn'
cache-dependency-path: 'galaxy root/client/yarn.lock'
- uses: ./.github/setup-node/
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/toolshed.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,7 @@ jobs:
- uses: actions/checkout@v4
with:
path: 'galaxy root'
- uses: actions/setup-node@v4
with:
node-version: '18.12.1'
cache: 'yarn'
cache-dependency-path: 'galaxy root/client/yarn.lock'
- uses: ./.github/setup-node/
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/unit-postgres.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,7 @@ jobs:
- uses: actions/checkout@v4
with:
path: 'galaxy root'
- uses: actions/setup-node@v4
with:
node-version: '18.12.1'
cache: 'yarn'
cache-dependency-path: 'galaxy root/client/yarn.lock'
- uses: ./.github/setup-node/
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/unit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,7 @@ jobs:
- uses: actions/checkout@v4
with:
path: 'galaxy root'
- uses: actions/setup-node@v4
with:
node-version: '18.12.1'
cache: 'yarn'
cache-dependency-path: 'galaxy root/client/yarn.lock'
- uses: ./.github/setup-node/
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
Expand Down
2 changes: 1 addition & 1 deletion client/.node_version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.12.1
22.13.1
Loading