From 9145d7882c1783dd8712a4502e95ae25018951d1 Mon Sep 17 00:00:00 2001 From: PPawlowski Date: Tue, 11 Jun 2024 18:17:04 +0200 Subject: [PATCH 01/13] Add possibility to build against various node versions --- .github/workflows/build_node_package.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_node_package.yml b/.github/workflows/build_node_package.yml index c54ca37..e8cbef6 100644 --- a/.github/workflows/build_node_package.yml +++ b/.github/workflows/build_node_package.yml @@ -8,21 +8,27 @@ on: required: false type: boolean default: false + node_version: + description: 'Node.js version' + required: false + type: string + default: '["18.x"]' jobs: build: runs-on: ubuntu-latest strategy: matrix: - node-version: [16.x] + node-version: ${{ fromJson(inputs.node_version)}} + steps: - name: Checkout uses: actions/checkout@v4 - - name: Use Node.js ${{ inputs.node_version }} + - name: Use Node.js ${{ matrix.node-version}} uses: actions/setup-node@v4 with: - node-version: ${{ inputs.node_version }} + node-version: ${{ matrix.node_version }} - name: Install Dependencies run: npm ci From 253c9945e66cdf0788083d8a71677d8ce0087eb8 Mon Sep 17 00:00:00 2001 From: PPawlowski Date: Tue, 11 Jun 2024 18:18:32 +0200 Subject: [PATCH 02/13] Fix default version --- .github/workflows/build_node_package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_node_package.yml b/.github/workflows/build_node_package.yml index e8cbef6..5e63c26 100644 --- a/.github/workflows/build_node_package.yml +++ b/.github/workflows/build_node_package.yml @@ -12,7 +12,7 @@ on: description: 'Node.js version' required: false type: string - default: '["18.x"]' + default: '["18"]' jobs: build: From f28e8b0b9cdc19f476c24b400abfa1664a95e2ef Mon Sep 17 00:00:00 2001 From: PPawlowski Date: Tue, 11 Jun 2024 18:22:20 +0200 Subject: [PATCH 03/13] Typo fix --- .github/workflows/build_node_package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_node_package.yml b/.github/workflows/build_node_package.yml index 5e63c26..4e41018 100644 --- a/.github/workflows/build_node_package.yml +++ b/.github/workflows/build_node_package.yml @@ -28,7 +28,7 @@ jobs: - name: Use Node.js ${{ matrix.node-version}} uses: actions/setup-node@v4 with: - node-version: ${{ matrix.node_version }} + node-version: ${{ matrix.node-version }} - name: Install Dependencies run: npm ci From 909253f7c182ce923cd38cce444f9bc72bded899 Mon Sep 17 00:00:00 2001 From: PPawlowski Date: Tue, 11 Jun 2024 18:24:26 +0200 Subject: [PATCH 04/13] Disable fail fast --- .github/workflows/build_node_package.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_node_package.yml b/.github/workflows/build_node_package.yml index 4e41018..c88cc14 100644 --- a/.github/workflows/build_node_package.yml +++ b/.github/workflows/build_node_package.yml @@ -18,6 +18,7 @@ jobs: build: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: node-version: ${{ fromJson(inputs.node_version)}} From 245ff60d01ee0168f81b1d178f76f7ca1924d74d Mon Sep 17 00:00:00 2001 From: PPawlowski Date: Tue, 11 Jun 2024 18:36:34 +0200 Subject: [PATCH 05/13] Change approach to node_version input --- .github/workflows/build_node_package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_node_package.yml b/.github/workflows/build_node_package.yml index c88cc14..2d020c6 100644 --- a/.github/workflows/build_node_package.yml +++ b/.github/workflows/build_node_package.yml @@ -12,7 +12,7 @@ on: description: 'Node.js version' required: false type: string - default: '["18"]' + default: '[18]' jobs: build: From 7dcdbec484483a9fa7d908855fd3c5c1d7bb084f Mon Sep 17 00:00:00 2001 From: PPawlowski Date: Wed, 12 Jun 2024 10:26:36 +0200 Subject: [PATCH 06/13] Extend control over each node version --- .github/workflows/build_node_package.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build_node_package.yml b/.github/workflows/build_node_package.yml index 2d020c6..de83381 100644 --- a/.github/workflows/build_node_package.yml +++ b/.github/workflows/build_node_package.yml @@ -8,11 +8,11 @@ on: required: false type: boolean default: false - node_version: - description: 'Node.js version' - required: false + node: + description: 'JSON array of Node.js versions and parameters' + required: true type: string - default: '[18]' + default: '[{"version": "18", "test": true, "lint": true}]' jobs: build: @@ -20,23 +20,24 @@ jobs: strategy: fail-fast: false matrix: - node-version: ${{ fromJson(inputs.node_version)}} + node-version: ${{ fromJson(inputs.node)}} steps: - name: Checkout uses: actions/checkout@v4 - - name: Use Node.js ${{ matrix.node-version}} + - name: Use Node.js ${{ matrix.version}} uses: actions/setup-node@v4 with: - node-version: ${{ matrix.node-version }} + node-version: ${{ matrix.version }} - name: Install Dependencies run: npm ci - name: Run lint + if: ${{ matrix.lint }} run: npm run lint - name: Run tests - if: ${{ fromJson(inputs.run_tests)}} + if: ${{ matrix.test }} run: npm run test From e685f5e04b9797c589fb6fcc9cee17c2ef0fec7d Mon Sep 17 00:00:00 2001 From: PPawlowski Date: Wed, 12 Jun 2024 10:28:14 +0200 Subject: [PATCH 07/13] Do not require node input --- .github/workflows/build_node_package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_node_package.yml b/.github/workflows/build_node_package.yml index de83381..8e8b9e1 100644 --- a/.github/workflows/build_node_package.yml +++ b/.github/workflows/build_node_package.yml @@ -10,7 +10,7 @@ on: default: false node: description: 'JSON array of Node.js versions and parameters' - required: true + required: false type: string default: '[{"version": "18", "test": true, "lint": true}]' From 4bac9827df00508ade3ebd249935b34f1be18e22 Mon Sep 17 00:00:00 2001 From: PPawlowski Date: Wed, 12 Jun 2024 10:34:03 +0200 Subject: [PATCH 08/13] Change default job name --- .github/workflows/build_node_package.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_node_package.yml b/.github/workflows/build_node_package.yml index 8e8b9e1..f6c9722 100644 --- a/.github/workflows/build_node_package.yml +++ b/.github/workflows/build_node_package.yml @@ -17,6 +17,7 @@ on: jobs: build: runs-on: ubuntu-latest + name: Build on ${{ matrix.version }} strategy: fail-fast: false matrix: From bfbbf507d8b93652c4cab91250e35f0ece0e023c Mon Sep 17 00:00:00 2001 From: PPawlowski Date: Wed, 12 Jun 2024 10:36:14 +0200 Subject: [PATCH 09/13] Change default job name --- .github/workflows/build_node_package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_node_package.yml b/.github/workflows/build_node_package.yml index f6c9722..8f925ee 100644 --- a/.github/workflows/build_node_package.yml +++ b/.github/workflows/build_node_package.yml @@ -17,11 +17,11 @@ on: jobs: build: runs-on: ubuntu-latest - name: Build on ${{ matrix.version }} strategy: fail-fast: false matrix: node-version: ${{ fromJson(inputs.node)}} + name: Build on ${{ matrix.version }} steps: - name: Checkout From 882865cb31c2f88aa3317b3f275fe31db14384cf Mon Sep 17 00:00:00 2001 From: PPawlowski Date: Wed, 12 Jun 2024 10:37:07 +0200 Subject: [PATCH 10/13] Handle boolean values properly --- .github/workflows/build_node_package.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_node_package.yml b/.github/workflows/build_node_package.yml index 8f925ee..5f43e8b 100644 --- a/.github/workflows/build_node_package.yml +++ b/.github/workflows/build_node_package.yml @@ -36,9 +36,9 @@ jobs: run: npm ci - name: Run lint - if: ${{ matrix.lint }} + if: ${{ fromJson(matrix.lint) }} run: npm run lint - name: Run tests - if: ${{ matrix.test }} + if: ${{ fromJson(matrix.test) }} run: npm run test From be267f7f5218278b1b25df2a403fcf821e4896b6 Mon Sep 17 00:00:00 2001 From: PPawlowski Date: Wed, 12 Jun 2024 10:40:41 +0200 Subject: [PATCH 11/13] fix matrix approach --- .github/workflows/build_node_package.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_node_package.yml b/.github/workflows/build_node_package.yml index 5f43e8b..90a4686 100644 --- a/.github/workflows/build_node_package.yml +++ b/.github/workflows/build_node_package.yml @@ -12,7 +12,7 @@ on: description: 'JSON array of Node.js versions and parameters' required: false type: string - default: '[{"version": "18", "test": true, "lint": true}]' + default: '[{"version": "18", "tests": true, "lint": true}]' jobs: build: @@ -27,18 +27,18 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Use Node.js ${{ matrix.version}} + - name: Use Node.js ${{ matrix.node.version}} uses: actions/setup-node@v4 with: - node-version: ${{ matrix.version }} + node-version: ${{ matrix.node.version }} - name: Install Dependencies run: npm ci - name: Run lint - if: ${{ fromJson(matrix.lint) }} + if: ${{ fromJson(matrix.node.lint) }} run: npm run lint - name: Run tests - if: ${{ fromJson(matrix.test) }} + if: ${{ fromJson(matrix.node.tests) }} run: npm run test From f825a0349e4bb974168087191c46f51534d06a50 Mon Sep 17 00:00:00 2001 From: PPawlowski Date: Wed, 12 Jun 2024 10:47:06 +0200 Subject: [PATCH 12/13] fix matrix approach --- .github/workflows/build_node_package.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_node_package.yml b/.github/workflows/build_node_package.yml index 90a4686..fd891b0 100644 --- a/.github/workflows/build_node_package.yml +++ b/.github/workflows/build_node_package.yml @@ -20,8 +20,8 @@ jobs: strategy: fail-fast: false matrix: - node-version: ${{ fromJson(inputs.node)}} - name: Build on ${{ matrix.version }} + node: ${{ fromJson(inputs.node)}} + name: Build on ${{ matrix.node.version }} steps: - name: Checkout From 61be60b94d8109ee910102e502f9148bb57790bf Mon Sep 17 00:00:00 2001 From: PPawlowski Date: Wed, 12 Jun 2024 10:58:30 +0200 Subject: [PATCH 13/13] Remove unused `run_tests` input --- .github/workflows/build_node_package.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/build_node_package.yml b/.github/workflows/build_node_package.yml index fd891b0..aee8da8 100644 --- a/.github/workflows/build_node_package.yml +++ b/.github/workflows/build_node_package.yml @@ -3,11 +3,6 @@ name: Build and test npm package on: workflow_call: inputs: - run_tests: - description: 'Run tests' - required: false - type: boolean - default: false node: description: 'JSON array of Node.js versions and parameters' required: false