Skip to content

Commit

Permalink
Swap actions to use setup-node composite action.
Browse files Browse the repository at this point in the history
  • Loading branch information
dannon committed Aug 22, 2024
1 parent e05424c commit 4c65ae3
Show file tree
Hide file tree
Showing 19 changed files with 19 additions and 98 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,7 @@ jobs:
- uses: actions/checkout@v4
with:
path: 'galaxy root'
- uses: actions/setup-node@v4
with:
node-version: '20.16.0'
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/build_client.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,7 @@ jobs:
- uses: actions/checkout@v4
with:
path: 'galaxy root'
- uses: actions/setup-node@v4
with:
node-version: '20.16.0'
cache: 'yarn'
cache-dependency-path: 'galaxy root/client/yarn.lock'
- uses: ./.github/setup-node/
- name: get client commit
id: client-commit
shell: bash
Expand Down
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: '20.16.0'
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: '20.16.0'
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: '20.16.0'
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: '20.16.0'
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 @@ -43,11 +43,7 @@ jobs:
- uses: actions/checkout@v4
with:
path: 'galaxy root'
- uses: actions/setup-node@v4
with:
node-version: '20.16.0'
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: '20.16.0'
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 @@ -68,11 +68,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: '20.16.0'
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: [20.16.0]
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
6 changes: 1 addition & 5 deletions .github/workflows/lint_openapi_schema.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,7 @@ jobs:
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- uses: actions/setup-node@v4
with:
node-version: '20.16.0'
cache: 'yarn'
cache-dependency-path: 'galaxy root/client/yarn.lock'
- uses: ./.github/setup-node/
- name: Get full Python version
id: full-python-version
shell: bash
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: '20.16.0'
cache: 'yarn'
cache-dependency-path: 'galaxy root/client/yarn.lock'
- uses: ./.github/setup-node/
- name: Get full Python version
id: full-python-version
shell: bash
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: '20.16.0'
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: '20.16.0'
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: '20.16.0'
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: '20.16.0'
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: '20.16.0'
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: '20.16.0'
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 @@ -28,11 +28,7 @@ jobs:
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- uses: actions/setup-node@v4
with:
node-version: '20.16.0'
cache: 'yarn'
cache-dependency-path: 'galaxy root/client/yarn.lock'
- uses: ./.github/setup-node/
- name: Get full Python version
id: full-python-version
shell: bash
Expand Down

0 comments on commit 4c65ae3

Please sign in to comment.