From 4c65ae3cbe5c98745f337f0b56faba84eeda1e32 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Thu, 22 Aug 2024 08:54:09 -0400 Subject: [PATCH] Swap actions to use setup-node composite action. --- .github/workflows/api.yaml | 6 +----- .github/workflows/build_client.yaml | 6 +----- .github/workflows/converter_tests.yaml | 6 +----- .github/workflows/cwl_conformance.yaml | 6 +----- .github/workflows/first_startup.yaml | 6 +----- .github/workflows/framework_tools.yaml | 6 +----- .github/workflows/framework_workflows.yaml | 6 +----- .github/workflows/integration.yaml | 6 +----- .github/workflows/integration_selenium.yaml | 6 +----- .github/workflows/jest.yaml | 9 +-------- .github/workflows/lint_openapi_schema.yml | 6 +----- .github/workflows/osx_startup.yaml | 6 +----- .github/workflows/performance.yaml | 6 +----- .github/workflows/reports_startup.yaml | 6 +----- .github/workflows/selenium.yaml | 6 +----- .github/workflows/test_galaxy_packages.yaml | 6 +----- .github/workflows/toolshed.yaml | 6 +----- .github/workflows/unit-postgres.yaml | 6 +----- .github/workflows/unit.yaml | 6 +----- 19 files changed, 19 insertions(+), 98 deletions(-) diff --git a/.github/workflows/api.yaml b/.github/workflows/api.yaml index 114bf31b4ca7..081bc590e13b 100644 --- a/.github/workflows/api.yaml +++ b/.github/workflows/api.yaml @@ -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 }} diff --git a/.github/workflows/build_client.yaml b/.github/workflows/build_client.yaml index bd316bebf273..a89672a6a539 100644 --- a/.github/workflows/build_client.yaml +++ b/.github/workflows/build_client.yaml @@ -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 diff --git a/.github/workflows/converter_tests.yaml b/.github/workflows/converter_tests.yaml index 26c622953e27..cbe13977077c 100644 --- a/.github/workflows/converter_tests.yaml +++ b/.github/workflows/converter_tests.yaml @@ -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: diff --git a/.github/workflows/cwl_conformance.yaml b/.github/workflows/cwl_conformance.yaml index 4a59c340bc3b..ed8c51d6da2d 100644 --- a/.github/workflows/cwl_conformance.yaml +++ b/.github/workflows/cwl_conformance.yaml @@ -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 }} diff --git a/.github/workflows/first_startup.yaml b/.github/workflows/first_startup.yaml index 57d96053b3ce..fe4b02473684 100644 --- a/.github/workflows/first_startup.yaml +++ b/.github/workflows/first_startup.yaml @@ -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: diff --git a/.github/workflows/framework_tools.yaml b/.github/workflows/framework_tools.yaml index 8945c97a6e08..133bc5ecf3bd 100644 --- a/.github/workflows/framework_tools.yaml +++ b/.github/workflows/framework_tools.yaml @@ -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 }} diff --git a/.github/workflows/framework_workflows.yaml b/.github/workflows/framework_workflows.yaml index bf5d84479218..f51cae825b67 100644 --- a/.github/workflows/framework_workflows.yaml +++ b/.github/workflows/framework_workflows.yaml @@ -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 }} diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml index af8e1650cacf..50981f67e3d6 100644 --- a/.github/workflows/integration.yaml +++ b/.github/workflows/integration.yaml @@ -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 }} diff --git a/.github/workflows/integration_selenium.yaml b/.github/workflows/integration_selenium.yaml index 0c201291f6ea..55a43abc1dd8 100644 --- a/.github/workflows/integration_selenium.yaml +++ b/.github/workflows/integration_selenium.yaml @@ -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: diff --git a/.github/workflows/jest.yaml b/.github/workflows/jest.yaml index ef5aaf367e10..631c9b8abe91 100644 --- a/.github/workflows/jest.yaml +++ b/.github/workflows/jest.yaml @@ -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) diff --git a/.github/workflows/lint_openapi_schema.yml b/.github/workflows/lint_openapi_schema.yml index ea7248700962..3e212ae13494 100644 --- a/.github/workflows/lint_openapi_schema.yml +++ b/.github/workflows/lint_openapi_schema.yml @@ -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 diff --git a/.github/workflows/osx_startup.yaml b/.github/workflows/osx_startup.yaml index 78cdd14d765f..43596f3df107 100644 --- a/.github/workflows/osx_startup.yaml +++ b/.github/workflows/osx_startup.yaml @@ -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 diff --git a/.github/workflows/performance.yaml b/.github/workflows/performance.yaml index 3b49879c7c05..0c0df0a4fdb5 100644 --- a/.github/workflows/performance.yaml +++ b/.github/workflows/performance.yaml @@ -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 }} diff --git a/.github/workflows/reports_startup.yaml b/.github/workflows/reports_startup.yaml index af7d1eeae541..7b2219c791b2 100644 --- a/.github/workflows/reports_startup.yaml +++ b/.github/workflows/reports_startup.yaml @@ -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: diff --git a/.github/workflows/selenium.yaml b/.github/workflows/selenium.yaml index 6c47d2dac611..d6f6463b6beb 100644 --- a/.github/workflows/selenium.yaml +++ b/.github/workflows/selenium.yaml @@ -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 }} diff --git a/.github/workflows/test_galaxy_packages.yaml b/.github/workflows/test_galaxy_packages.yaml index 3a844723e560..da02d5192a3a 100644 --- a/.github/workflows/test_galaxy_packages.yaml +++ b/.github/workflows/test_galaxy_packages.yaml @@ -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 }} diff --git a/.github/workflows/toolshed.yaml b/.github/workflows/toolshed.yaml index 4298d2bd4f11..a58bfa977763 100644 --- a/.github/workflows/toolshed.yaml +++ b/.github/workflows/toolshed.yaml @@ -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 }} diff --git a/.github/workflows/unit-postgres.yaml b/.github/workflows/unit-postgres.yaml index ce7e46eb37e7..ea14edc840f5 100644 --- a/.github/workflows/unit-postgres.yaml +++ b/.github/workflows/unit-postgres.yaml @@ -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 }} diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml index 4f5897a57a5f..1cd0a22869cd 100644 --- a/.github/workflows/unit.yaml +++ b/.github/workflows/unit.yaml @@ -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