Skip to content

Commit

Permalink
fix: remove 'All' from regular test job name
Browse files Browse the repository at this point in the history
  • Loading branch information
lukekarrys committed Sep 19, 2022
1 parent 2abf443 commit 817d49e
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
check_id: ${{ steps.check.outputs.check_id }}

test-all:
name: Test All - ${{ matrix.platform.name }} - Node ${{ matrix.node-version }}
name: Test All - ${{ matrix.platform.name }} - ${{ matrix.node-version }}
if: github.repository_owner == 'npm'
strategy:
fail-fast: false
Expand Down Expand Up @@ -101,7 +101,7 @@ jobs:
with:
token: ${{ secrets.GITHUB_TOKEN }}
status: in_progress
name: Test All - ${{ matrix.platform.name }} - Node ${{ matrix.node-version }}
name: Test All - ${{ matrix.platform.name }} - ${{ matrix.node-version }}
sha: ${{ inputs.check-sha }}
# XXX: this does not work when using the default GITHUB_TOKEN.
# Instead we post the main job url to the PR as a comment which
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
run: npm run postlint --ignore-scripts

test:
name: Test All - ${{ matrix.platform.name }} - Node ${{ matrix.node-version }}
name: Test - ${{ matrix.platform.name }} - ${{ matrix.node-version }}
if: github.repository_owner == 'npm'
strategy:
fail-fast: false
Expand Down
4 changes: 2 additions & 2 deletions lib/content/_job-matrix.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: {{ jobName }}
name: {{ jobName }} - $\{{ matrix.platform.name }} - $\{{ matrix.node-version }}
if: github.repository_owner == 'npm'
strategy:
fail-fast: false
Expand Down Expand Up @@ -26,4 +26,4 @@ defaults:
run:
shell: $\{{ matrix.platform.shell }}
steps:
{{> stepsSetup jobNodeMatrix=true }}
{{> stepsSetup jobIsMatrix=true }}
2 changes: 1 addition & 1 deletion lib/content/_step-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
token: $\{{ secrets.GITHUB_TOKEN }}
{{#if jobCheck.sha}}
status: {{#if jobCheck.status}}{{ jobCheck.status }}{{else}}in_progress{{/if}}
name: {{#if jobCheck.name}}{{ jobCheck.name }}{{else}}{{ jobName }}{{/if}}
name: {{#if jobCheck.name}}{{ jobCheck.name }}{{else}}{{ jobName }}{{/if}}{{#if jobIsMatrix}} - $\{{ matrix.platform.name }} - $\{{ matrix.node-version }}{{/if}}
sha: {{ jobCheck.sha }}
# XXX: this does not work when using the default GITHUB_TOKEN.
# Instead we post the main job url to the PR as a comment which
Expand Down
4 changes: 2 additions & 2 deletions lib/content/_step-node.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: {{#if jobNodeMatrix}}$\{{ matrix.node-version }}{{else}}{{ last ciVersions }}{{/if}}
node-version: {{#if jobIsMatrix}}$\{{ matrix.node-version }}{{else}}{{ last ciVersions }}{{/if}}
{{#if lockfile}}
cache: npm
{{/if}}
{{#if updateNpm}}
{{#if jobNodeMatrix}}
{{#if jobIsMatrix}}
- name: Update Windows npm
# node 12 and 14 ship with npm@6, which is known to fail when updating itself in windows
if: matrix.platform.os == 'windows-latest' && (startsWith(matrix.node-version, '12.') || startsWith(matrix.node-version, '14.'))
Expand Down
2 changes: 1 addition & 1 deletion lib/content/ci-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

test-all:
{{> jobMatrix
jobName="Test All - ${{ matrix.platform.name }} - Node ${{ matrix.node-version }}"
jobName="Test All"
jobCheck=(obj sha="${{ inputs.check-sha }}")
jobCheckout=(obj ref="${{ inputs.ref }}")
}}
Expand Down
2 changes: 1 addition & 1 deletion lib/content/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ jobs:
{{> stepLint jobRunFlags=pkgFlags }}

test:
{{> jobMatrix jobName="Test All - ${{ matrix.platform.name }} - Node ${{ matrix.node-version }}" }}
{{> jobMatrix jobName="Test" }}
{{> stepTest jobRunFlags=pkgFlags }}
24 changes: 12 additions & 12 deletions tap-snapshots/test/apply/source-snapshots.js.test.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ jobs:
check_id: \${{ steps.check.outputs.check_id }}
test-all:
name: Test All - \${{ matrix.platform.name }} - Node \${{ matrix.node-version }}
name: Test All - \${{ matrix.platform.name }} - \${{ matrix.node-version }}
if: github.repository_owner == 'npm'
strategy:
fail-fast: false
Expand Down Expand Up @@ -308,7 +308,7 @@ jobs:
with:
token: \${{ secrets.GITHUB_TOKEN }}
status: in_progress
name: Test All - \${{ matrix.platform.name }} - Node \${{ matrix.node-version }}
name: Test All - \${{ matrix.platform.name }} - \${{ matrix.node-version }}
sha: \${{ inputs.check-sha }}
# XXX: this does not work when using the default GITHUB_TOKEN.
# Instead we post the main job url to the PR as a comment which
Expand Down Expand Up @@ -408,7 +408,7 @@ jobs:
run: npm run postlint --ignore-scripts
test:
name: Test All - \${{ matrix.platform.name }} - Node \${{ matrix.node-version }}
name: Test - \${{ matrix.platform.name }} - \${{ matrix.node-version }}
if: github.repository_owner == 'npm'
strategy:
fail-fast: false
Expand Down Expand Up @@ -1322,7 +1322,7 @@ jobs:
run: npm run postlint --ignore-scripts
test:
name: Test All - \${{ matrix.platform.name }} - Node \${{ matrix.node-version }}
name: Test - \${{ matrix.platform.name }} - \${{ matrix.node-version }}
if: github.repository_owner == 'npm'
strategy:
fail-fast: false
Expand Down Expand Up @@ -1436,7 +1436,7 @@ jobs:
run: npm run postlint --ignore-scripts
test:
name: Test All - \${{ matrix.platform.name }} - Node \${{ matrix.node-version }}
name: Test - \${{ matrix.platform.name }} - \${{ matrix.node-version }}
if: github.repository_owner == 'npm'
strategy:
fail-fast: false
Expand Down Expand Up @@ -1569,7 +1569,7 @@ jobs:
check_id: \${{ steps.check.outputs.check_id }}
test-all:
name: Test All - \${{ matrix.platform.name }} - Node \${{ matrix.node-version }}
name: Test All - \${{ matrix.platform.name }} - \${{ matrix.node-version }}
if: github.repository_owner == 'npm'
strategy:
fail-fast: false
Expand Down Expand Up @@ -1603,7 +1603,7 @@ jobs:
with:
token: \${{ secrets.GITHUB_TOKEN }}
status: in_progress
name: Test All - \${{ matrix.platform.name }} - Node \${{ matrix.node-version }}
name: Test All - \${{ matrix.platform.name }} - \${{ matrix.node-version }}
sha: \${{ inputs.check-sha }}
# XXX: this does not work when using the default GITHUB_TOKEN.
# Instead we post the main job url to the PR as a comment which
Expand Down Expand Up @@ -1705,7 +1705,7 @@ jobs:
run: npm run postlint --ignore-scripts
test:
name: Test All - \${{ matrix.platform.name }} - Node \${{ matrix.node-version }}
name: Test - \${{ matrix.platform.name }} - \${{ matrix.node-version }}
if: github.repository_owner == 'npm'
strategy:
fail-fast: false
Expand Down Expand Up @@ -2621,7 +2621,7 @@ jobs:
run: npm run postlint --ignore-scripts
test:
name: Test All - \${{ matrix.platform.name }} - Node \${{ matrix.node-version }}
name: Test - \${{ matrix.platform.name }} - \${{ matrix.node-version }}
if: github.repository_owner == 'npm'
strategy:
fail-fast: false
Expand Down Expand Up @@ -2735,7 +2735,7 @@ jobs:
run: npm run postlint --ignore-scripts
test:
name: Test All - \${{ matrix.platform.name }} - Node \${{ matrix.node-version }}
name: Test - \${{ matrix.platform.name }} - \${{ matrix.node-version }}
if: github.repository_owner == 'npm'
strategy:
fail-fast: false
Expand Down Expand Up @@ -2868,7 +2868,7 @@ jobs:
check_id: \${{ steps.check.outputs.check_id }}
test-all:
name: Test All - \${{ matrix.platform.name }} - Node \${{ matrix.node-version }}
name: Test All - \${{ matrix.platform.name }} - \${{ matrix.node-version }}
if: github.repository_owner == 'npm'
strategy:
fail-fast: false
Expand Down Expand Up @@ -2902,7 +2902,7 @@ jobs:
with:
token: \${{ secrets.GITHUB_TOKEN }}
status: in_progress
name: Test All - \${{ matrix.platform.name }} - Node \${{ matrix.node-version }}
name: Test All - \${{ matrix.platform.name }} - \${{ matrix.node-version }}
sha: \${{ inputs.check-sha }}
# XXX: this does not work when using the default GITHUB_TOKEN.
# Instead we post the main job url to the PR as a comment which
Expand Down

0 comments on commit 817d49e

Please sign in to comment.