From 8ac6cdcd9e6f0f854cb641f2e8cf7d094254a958 Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Thu, 8 Aug 2024 17:39:46 -0400
Subject: [PATCH 01/13] Test w/ node version 20 in advance of updating default
 Galaxy pinned nodejs

---
 .github/workflows/api.yaml                  | 2 +-
 .github/workflows/build_client.yaml         | 2 +-
 .github/workflows/converter_tests.yaml      | 2 +-
 .github/workflows/cwl_conformance.yaml      | 2 +-
 .github/workflows/first_startup.yaml        | 2 +-
 .github/workflows/framework_tools.yaml      | 2 +-
 .github/workflows/framework_workflows.yaml  | 2 +-
 .github/workflows/integration.yaml          | 2 +-
 .github/workflows/integration_selenium.yaml | 2 +-
 .github/workflows/lint_openapi_schema.yml   | 2 +-
 .github/workflows/osx_startup.yaml          | 2 +-
 .github/workflows/performance.yaml          | 2 +-
 .github/workflows/reports_startup.yaml      | 2 +-
 .github/workflows/selenium.yaml             | 2 +-
 .github/workflows/test_galaxy_packages.yaml | 2 +-
 .github/workflows/toolshed.yaml             | 2 +-
 .github/workflows/unit-postgres.yaml        | 2 +-
 .github/workflows/unit.yaml                 | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/api.yaml b/.github/workflows/api.yaml
index 8eb5a2dd564a..aa5db21d7ffb 100644
--- a/.github/workflows/api.yaml
+++ b/.github/workflows/api.yaml
@@ -49,7 +49,7 @@ jobs:
           path: 'galaxy root'
       - uses: actions/setup-node@v4
         with:
-          node-version: '18.12.1'
+          node-version: '20.16.0'
           cache: 'yarn'
           cache-dependency-path: 'galaxy root/client/yarn.lock'
       - uses: actions/setup-python@v5
diff --git a/.github/workflows/build_client.yaml b/.github/workflows/build_client.yaml
index c31032013902..bd316bebf273 100644
--- a/.github/workflows/build_client.yaml
+++ b/.github/workflows/build_client.yaml
@@ -16,7 +16,7 @@ jobs:
           path: 'galaxy root'
       - uses: actions/setup-node@v4
         with:
-          node-version: '18.12.1'
+          node-version: '20.16.0'
           cache: 'yarn'
           cache-dependency-path: 'galaxy root/client/yarn.lock'
       - name: get client commit
diff --git a/.github/workflows/converter_tests.yaml b/.github/workflows/converter_tests.yaml
index b953699e6048..395b74c0e118 100644
--- a/.github/workflows/converter_tests.yaml
+++ b/.github/workflows/converter_tests.yaml
@@ -33,7 +33,7 @@ jobs:
           path: 'galaxy root'
       - uses: actions/setup-node@v4
         with:
-          node-version: '18.12.1'
+          node-version: '20.16.0'
           cache: 'yarn'
           cache-dependency-path: 'galaxy root/client/yarn.lock'
       - name: Clone galaxyproject/galaxy-test-data
diff --git a/.github/workflows/cwl_conformance.yaml b/.github/workflows/cwl_conformance.yaml
index 10fb215bf042..e3fcce2114ea 100644
--- a/.github/workflows/cwl_conformance.yaml
+++ b/.github/workflows/cwl_conformance.yaml
@@ -42,7 +42,7 @@ jobs:
           path: 'galaxy root'
       - uses: actions/setup-node@v4
         with:
-          node-version: '18.12.1'
+          node-version: '20.16.0'
           cache: 'yarn'
           cache-dependency-path: 'galaxy root/client/yarn.lock'
       - uses: actions/setup-python@v5
diff --git a/.github/workflows/first_startup.yaml b/.github/workflows/first_startup.yaml
index e35170d063a0..61726426286e 100644
--- a/.github/workflows/first_startup.yaml
+++ b/.github/workflows/first_startup.yaml
@@ -33,7 +33,7 @@ jobs:
           path: 'galaxy root'
       - uses: actions/setup-node@v4
         with:
-          node-version: '18.12.1'
+          node-version: '20.16.0'
           cache: 'yarn'
           cache-dependency-path: 'galaxy root/client/yarn.lock'
       - name: Set up Python
diff --git a/.github/workflows/framework_tools.yaml b/.github/workflows/framework_tools.yaml
index a55dfa316488..732c103eff74 100644
--- a/.github/workflows/framework_tools.yaml
+++ b/.github/workflows/framework_tools.yaml
@@ -45,7 +45,7 @@ jobs:
           path: 'galaxy root'
       - uses: actions/setup-node@v4
         with:
-          node-version: '18.12.1'
+          node-version: '20.16.0'
           cache: 'yarn'
           cache-dependency-path: 'galaxy root/client/yarn.lock'
       - uses: actions/setup-python@v5
diff --git a/.github/workflows/framework_workflows.yaml b/.github/workflows/framework_workflows.yaml
index 93ab6c0bbf1a..c88cdf328c01 100644
--- a/.github/workflows/framework_workflows.yaml
+++ b/.github/workflows/framework_workflows.yaml
@@ -45,7 +45,7 @@ jobs:
           path: 'galaxy root'
       - uses: actions/setup-node@v4
         with:
-          node-version: '18.12.1'
+          node-version: '20.16.0'
           cache: 'yarn'
           cache-dependency-path: 'galaxy root/client/yarn.lock'
       - uses: actions/setup-python@v5
diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
index 4a62c094e71d..4c426bf741e9 100644
--- a/.github/workflows/integration.yaml
+++ b/.github/workflows/integration.yaml
@@ -70,7 +70,7 @@ jobs:
           path: 'galaxy root'
       - uses: actions/setup-node@v4
         with:
-          node-version: '18.12.1'
+          node-version: '20.16.0'
           cache: 'yarn'
           cache-dependency-path: 'galaxy root/client/yarn.lock'
       - uses: actions/setup-python@v5
diff --git a/.github/workflows/integration_selenium.yaml b/.github/workflows/integration_selenium.yaml
index 311fb16a96f0..a37fad5be4e4 100644
--- a/.github/workflows/integration_selenium.yaml
+++ b/.github/workflows/integration_selenium.yaml
@@ -67,7 +67,7 @@ jobs:
           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'
+          node-version: '20.16.0'
           cache: 'yarn'
           cache-dependency-path: 'galaxy root/client/yarn.lock'
       - name: Restore client cache
diff --git a/.github/workflows/lint_openapi_schema.yml b/.github/workflows/lint_openapi_schema.yml
index 2a94508ce6f2..5b6fcc3b6ba0 100644
--- a/.github/workflows/lint_openapi_schema.yml
+++ b/.github/workflows/lint_openapi_schema.yml
@@ -27,7 +27,7 @@ jobs:
           path: 'galaxy root'
       - uses: actions/setup-node@v4
         with:
-          node-version: '18.12.1'
+          node-version: '20.16.0'
           cache: 'yarn'
           cache-dependency-path: 'galaxy root/client/yarn.lock'
       - uses: actions/setup-python@v5
diff --git a/.github/workflows/osx_startup.yaml b/.github/workflows/osx_startup.yaml
index 22ffc4d7e5b6..687b595f7eb1 100644
--- a/.github/workflows/osx_startup.yaml
+++ b/.github/workflows/osx_startup.yaml
@@ -31,7 +31,7 @@ jobs:
           path: 'galaxy root'
       - uses: actions/setup-node@v4
         with:
-          node-version: '18.12.1'
+          node-version: '20.16.0'
           cache: 'yarn'
           cache-dependency-path: 'galaxy root/client/yarn.lock'
       - name: Cache pip dir
diff --git a/.github/workflows/performance.yaml b/.github/workflows/performance.yaml
index ab4063c51f7d..bef8d73b49f2 100644
--- a/.github/workflows/performance.yaml
+++ b/.github/workflows/performance.yaml
@@ -44,7 +44,7 @@ jobs:
           path: 'galaxy root'
       - uses: actions/setup-node@v4
         with:
-          node-version: '18.12.1'
+          node-version: '20.16.0'
           cache: 'yarn'
           cache-dependency-path: 'galaxy root/client/yarn.lock'
       - uses: actions/setup-python@v5
diff --git a/.github/workflows/reports_startup.yaml b/.github/workflows/reports_startup.yaml
index 137c1a5e1204..f2f8c1e21f53 100644
--- a/.github/workflows/reports_startup.yaml
+++ b/.github/workflows/reports_startup.yaml
@@ -28,7 +28,7 @@ jobs:
           path: 'galaxy root'
       - uses: actions/setup-node@v4
         with:
-          node-version: '18.12.1'
+          node-version: '20.16.0'
           cache: 'yarn'
           cache-dependency-path: 'galaxy root/client/yarn.lock'
       - name: Set up Python
diff --git a/.github/workflows/selenium.yaml b/.github/workflows/selenium.yaml
index 195eb02b3de0..695a795eed60 100644
--- a/.github/workflows/selenium.yaml
+++ b/.github/workflows/selenium.yaml
@@ -53,7 +53,7 @@ jobs:
           path: 'galaxy root'
       - uses: actions/setup-node@v4
         with:
-          node-version: '18.12.1'
+          node-version: '20.16.0'
           cache: 'yarn'
           cache-dependency-path: 'galaxy root/client/yarn.lock'
       - uses: actions/setup-python@v5
diff --git a/.github/workflows/test_galaxy_packages.yaml b/.github/workflows/test_galaxy_packages.yaml
index 293e98e658bd..466bc2921ecf 100644
--- a/.github/workflows/test_galaxy_packages.yaml
+++ b/.github/workflows/test_galaxy_packages.yaml
@@ -25,7 +25,7 @@ jobs:
           path: 'galaxy root'
       - uses: actions/setup-node@v4
         with:
-          node-version: '18.12.1'
+          node-version: '20.16.0'
           cache: 'yarn'
           cache-dependency-path: 'galaxy root/client/yarn.lock'
       - uses: actions/setup-python@v5
diff --git a/.github/workflows/toolshed.yaml b/.github/workflows/toolshed.yaml
index fae33b4e1225..b0ddb947a509 100644
--- a/.github/workflows/toolshed.yaml
+++ b/.github/workflows/toolshed.yaml
@@ -39,7 +39,7 @@ jobs:
           path: 'galaxy root'
       - uses: actions/setup-node@v4
         with:
-          node-version: '18.12.1'
+          node-version: '20.16.0'
           cache: 'yarn'
           cache-dependency-path: 'galaxy root/client/yarn.lock'
       - uses: actions/setup-python@v5
diff --git a/.github/workflows/unit-postgres.yaml b/.github/workflows/unit-postgres.yaml
index 92ee7795854c..53d53e894ef2 100644
--- a/.github/workflows/unit-postgres.yaml
+++ b/.github/workflows/unit-postgres.yaml
@@ -38,7 +38,7 @@ jobs:
           path: 'galaxy root'
       - uses: actions/setup-node@v4
         with:
-          node-version: '18.12.1'
+          node-version: '20.16.0'
           cache: 'yarn'
           cache-dependency-path: 'galaxy root/client/yarn.lock'
       - uses: actions/setup-python@v5
diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml
index 80f54e87a704..79bc725831e2 100644
--- a/.github/workflows/unit.yaml
+++ b/.github/workflows/unit.yaml
@@ -27,7 +27,7 @@ jobs:
           path: 'galaxy root'
       - uses: actions/setup-node@v4
         with:
-          node-version: '18.12.1'
+          node-version: '20.16.0'
           cache: 'yarn'
           cache-dependency-path: 'galaxy root/client/yarn.lock'
       - uses: actions/setup-python@v5

From 96cb4bd8cc55828340c3659bfc9763befcbf420f Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Thu, 8 Aug 2024 17:40:08 -0400
Subject: [PATCH 02/13] Upgrade galaxy default installed/pinned nodejs version
 to v20, from v18. See node release chart:
 https://nodejs.org/en/about/previous-releases

Node 20 is the current "Active LTS" and will be so until node 22 enters
active LTS later this fall.
---
 client/.node_version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/.node_version b/client/.node_version
index b460d6f2dea9..8ce7030825b5 100644
--- a/client/.node_version
+++ b/client/.node_version
@@ -1 +1 @@
-18.12.1
+20.16.0

From a99326a0b2fe828188f299a3e3540cef89960b51 Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Fri, 16 Aug 2024 11:40:17 -0400
Subject: [PATCH 03/13] Bump jest/lint node versions, use specific pinned ver

---
 .github/workflows/jest.yaml    | 2 +-
 .github/workflows/js_lint.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/jest.yaml b/.github/workflows/jest.yaml
index 0d69a1498299..ef5aaf367e10 100644
--- a/.github/workflows/jest.yaml
+++ b/.github/workflows/jest.yaml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: [18]
+        node: [20.16.0]
     steps:
       - uses: actions/checkout@v4
       - name: Setup node
diff --git a/.github/workflows/js_lint.yaml b/.github/workflows/js_lint.yaml
index ea821e1c105b..cef5588466e6 100644
--- a/.github/workflows/js_lint.yaml
+++ b/.github/workflows/js_lint.yaml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: [18]
+        node: [20.16.0]
     steps:
       - uses: actions/checkout@v4
       - name: Setup node

From 747989959a63d54633ab381e35d12fb4b606bc41 Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Fri, 16 Aug 2024 16:07:45 -0400
Subject: [PATCH 04/13] Test using a composite action to wrap all the node
 config

---
 .github/workflows/js_lint.yaml   | 10 +---------
 .github/workflows/setup-node.yml | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 9 deletions(-)
 create mode 100644 .github/workflows/setup-node.yml

diff --git a/.github/workflows/js_lint.yaml b/.github/workflows/js_lint.yaml
index cef5588466e6..a52b327cac64 100644
--- a/.github/workflows/js_lint.yaml
+++ b/.github/workflows/js_lint.yaml
@@ -14,17 +14,9 @@ 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/workflows/setup-node.yaml
       - run: yarn install --frozen-lockfile
         working-directory: client
       - name: Run ESLint
diff --git a/.github/workflows/setup-node.yml b/.github/workflows/setup-node.yml
new file mode 100644
index 000000000000..4d5b8732382b
--- /dev/null
+++ b/.github/workflows/setup-node.yml
@@ -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: true
+        default: '20.16.0'
+    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 }}
\ No newline at end of file

From 8d99befa9d9545a99f72325f755c5a82b3752fad Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Fri, 16 Aug 2024 16:08:18 -0400
Subject: [PATCH 05/13] Don't require node version -- use default to
 consolidate

---
 .github/workflows/setup-node.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/setup-node.yml b/.github/workflows/setup-node.yml
index 4d5b8732382b..1bf774106b4e 100644
--- a/.github/workflows/setup-node.yml
+++ b/.github/workflows/setup-node.yml
@@ -3,7 +3,7 @@ description: 'Sets up Node.js and installs dependencies'
 inputs:
     node-version:
         description: 'The Node.js version to use'
-        required: true
+        required: false
         default: '20.16.0'
     cache:
         description: 'Whether to cache dependencies'

From b456b60d0a425f57ec809fed2e4ee8f33c15998e Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Fri, 16 Aug 2024 21:24:46 -0400
Subject: [PATCH 06/13] yml->yaml

---
 .github/workflows/{setup-node.yml => setup-node.yaml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .github/workflows/{setup-node.yml => setup-node.yaml} (100%)

diff --git a/.github/workflows/setup-node.yml b/.github/workflows/setup-node.yaml
similarity index 100%
rename from .github/workflows/setup-node.yml
rename to .github/workflows/setup-node.yaml

From 3c763342f4215d749a8a2966c1f4e51e21d1fdde Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Wed, 21 Aug 2024 09:12:31 -0400
Subject: [PATCH 07/13] Composite actions shouldn't be in workflows?

---
 .github/{workflows => composite-actions}/setup-node.yaml | 0
 .github/workflows/js_lint.yaml                           | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename .github/{workflows => composite-actions}/setup-node.yaml (100%)

diff --git a/.github/workflows/setup-node.yaml b/.github/composite-actions/setup-node.yaml
similarity index 100%
rename from .github/workflows/setup-node.yaml
rename to .github/composite-actions/setup-node.yaml
diff --git a/.github/workflows/js_lint.yaml b/.github/workflows/js_lint.yaml
index a52b327cac64..4c47a6f73d0f 100644
--- a/.github/workflows/js_lint.yaml
+++ b/.github/workflows/js_lint.yaml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/workflows/setup-node.yaml
+      - uses: ./.github/composite-actions/setup-node.yaml
       - run: yarn install --frozen-lockfile
         working-directory: client
       - name: Run ESLint

From d9160e4d7f2c45902cf80652a164a78c586ea164 Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Wed, 21 Aug 2024 12:35:20 -0400
Subject: [PATCH 08/13] Shift setup-node to action.yaml

---
 .../setup-node.yaml => setup-node/action.yaml}                  | 0
 .github/workflows/js_lint.yaml                                  | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename .github/{composite-actions/setup-node.yaml => setup-node/action.yaml} (100%)

diff --git a/.github/composite-actions/setup-node.yaml b/.github/setup-node/action.yaml
similarity index 100%
rename from .github/composite-actions/setup-node.yaml
rename to .github/setup-node/action.yaml
diff --git a/.github/workflows/js_lint.yaml b/.github/workflows/js_lint.yaml
index 4c47a6f73d0f..aff8542d6d27 100644
--- a/.github/workflows/js_lint.yaml
+++ b/.github/workflows/js_lint.yaml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/composite-actions/setup-node.yaml
+      - uses: ./.github/setup-node/action.yaml
       - run: yarn install --frozen-lockfile
         working-directory: client
       - name: Run ESLint

From d1b5038d51f3c1ebde35b40f5970ac81a916dcea Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Wed, 21 Aug 2024 12:41:28 -0400
Subject: [PATCH 09/13] Is this what it wants for composite actions?  rebase me

---
 .github/workflows/js_lint.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/js_lint.yaml b/.github/workflows/js_lint.yaml
index aff8542d6d27..c3d3cb1efdd9 100644
--- a/.github/workflows/js_lint.yaml
+++ b/.github/workflows/js_lint.yaml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/setup-node/action.yaml
+      - uses: ./.github/setup-node/
       - run: yarn install --frozen-lockfile
         working-directory: client
       - name: Run ESLint

From ea3b0c1d7decd8f85b0bc322377f3ec3b1994547 Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Wed, 21 Aug 2024 14:45:02 -0400
Subject: [PATCH 10/13] Use galaxy root cache path

---
 .github/setup-node/action.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/setup-node/action.yaml b/.github/setup-node/action.yaml
index 1bf774106b4e..6d9eb08e557d 100644
--- a/.github/setup-node/action.yaml
+++ b/.github/setup-node/action.yaml
@@ -12,7 +12,7 @@ inputs:
     cache-dependency-path:
         description: 'The path to the dependency file to cache'
         required: false
-        default: 'client/yarn.lock'
+        default: 'galaxy root/client/yarn.lock'
 runs:
     using: "composite"
     steps:

From b6bfa0d8080613c0835a2838533614761092415f Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Thu, 22 Aug 2024 08:54:09 -0400
Subject: [PATCH 11/13] 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 aa5db21d7ffb..cdde639f0cc2 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 395b74c0e118..cb1c5fe3b023 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 e3fcce2114ea..90ca4c6d27dd 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 61726426286e..b738930f2f40 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 732c103eff74..67ba9c2f5179 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 c88cdf328c01..ea2067eae771 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 4c426bf741e9..5e064ae55b39 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 a37fad5be4e4..d2e61acb33da 100644
--- a/.github/workflows/integration_selenium.yaml
+++ b/.github/workflows/integration_selenium.yaml
@@ -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: '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 5b6fcc3b6ba0..8640354da11a 100644
--- a/.github/workflows/lint_openapi_schema.yml
+++ b/.github/workflows/lint_openapi_schema.yml
@@ -25,11 +25,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/osx_startup.yaml b/.github/workflows/osx_startup.yaml
index 687b595f7eb1..aa78ca694222 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: Cache pip dir
         uses: actions/cache@v4
         with:
diff --git a/.github/workflows/performance.yaml b/.github/workflows/performance.yaml
index bef8d73b49f2..5754c0702ae2 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 f2f8c1e21f53..3479bb39a898 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 695a795eed60..12f539ae38e0 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 466bc2921ecf..d495c73ffb7b 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 b0ddb947a509..0c226217a8cd 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 53d53e894ef2..741b9ce01d3c 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 79bc725831e2..45f35924ff2c 100644
--- a/.github/workflows/unit.yaml
+++ b/.github/workflows/unit.yaml
@@ -25,11 +25,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 }}

From ddd66bbbbecdac07c9c9b470ab8b0817f11de262 Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Thu, 22 Aug 2024 08:54:21 -0400
Subject: [PATCH 12/13] Fix default cache path

---
 .github/setup-node/action.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/setup-node/action.yaml b/.github/setup-node/action.yaml
index 6d9eb08e557d..e30400d42de5 100644
--- a/.github/setup-node/action.yaml
+++ b/.github/setup-node/action.yaml
@@ -12,7 +12,7 @@ inputs:
     cache-dependency-path:
         description: 'The path to the dependency file to cache'
         required: false
-        default: 'galaxy root/client/yarn.lock'
+        default: './client/yarn.lock'
 runs:
     using: "composite"
     steps:

From b90d8e83c141b5d47c501874e5d83b97400be9da Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Mon, 23 Sep 2024 11:38:48 -0400
Subject: [PATCH 13/13] Is this it?  (rebase)

---
 .github/workflows/api.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/api.yaml b/.github/workflows/api.yaml
index cdde639f0cc2..eecfae5a21f9 100644
--- a/.github/workflows/api.yaml
+++ b/.github/workflows/api.yaml
@@ -47,7 +47,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           path: 'galaxy root'
-      - uses: ./.github/setup-node/
+      - uses: ../.github/setup-node/
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}