Skip to content

Commit 0959cbe

Browse files
committed
Add support for non-preferred block scalars
Squashed commit of the following: commit 41468aa Merge: 962483d 4cd6558 Author: Paul Colby <[email protected]> Date: Fri Feb 16 12:36:52 2024 +1100 Merge branch 'main' into block-scalars commit 962483d Author: Paul Colby <[email protected]> Date: Fri Feb 16 12:28:27 2024 +1100 Handle excess whitespce in input paths commit 6748819 Author: Paul Colby <[email protected]> Date: Fri Feb 16 12:16:55 2024 +1100 Use a unqiue step ID commit a7162a5 Author: Paul Colby <[email protected]> Date: Fri Feb 16 12:12:15 2024 +1100 Add test (should break a la TDD)
1 parent 4cd6558 commit 0959cbe

File tree

3 files changed

+25
-3
lines changed

3 files changed

+25
-3
lines changed

.github/workflows/test.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,22 @@ jobs:
6464
path: >-
6565
./test/qtpokit-2554496971/test-results-linux-clang/test/unit/*.tap
6666
./test/qtpokit-2554496971/test-results-linux-gcc/test/unit/*.tap
67+
id: scalar
68+
- name: Check result
69+
run: diff ${EXTRA_DIFF_ARGS:-} --unified ./.github/workflows/expected/path.md "$SUMMARY_FILE"
70+
shell: bash
71+
env:
72+
SUMMARY_FILE: ${{ steps.scalar.outputs.summary-file }}
73+
74+
- name: Reset step summary
75+
run: '> "$GITHUB_STEP_SUMMARY"'
76+
shell: bash
77+
- name: Test block scalars with new lines
78+
uses: ./
79+
with:
80+
path: |
81+
./test/qtpokit-2554496971/test-results-linux-clang/test/unit/*.tap
82+
./test/qtpokit-2554496971/test-results-linux-gcc/test/unit/*.tap
6783
id: path
6884
- name: Check result
6985
run: diff ${EXTRA_DIFF_ARGS:-} --unified ./.github/workflows/expected/path.md "$SUMMARY_FILE"

CHANGELOG.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8-
## [Unreleased]
8+
## [1.1.1] (2024-02-16)
9+
10+
### Added
11+
12+
- Support for non-preferred block scalars (eg `|` or `>+` instead of `>-`).
913

1014
## [1.1.0] (2024-02-11)
1115

@@ -30,7 +34,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3034
- Support for summarising [Qt Test] [TAP] files.
3135
- Automated tests on all supported GitHub-hosted runners (`macos-*`, `ubuntu-*` and `windows-*`).
3236

33-
[unreleased]: https://github.com/pcolby/tap-summary/compare/v1.1.0...HEAD
37+
[unreleased]: https://github.com/pcolby/tap-summary/compare/v1.1.1...HEAD
38+
[1.1.1]: https://github.com/pcolby/tap-summary/releases/tag/v1.1.1
3439
[1.1.0]: https://github.com/pcolby/tap-summary/releases/tag/v1.1.0
3540
[1.0.1]: https://github.com/pcolby/tap-summary/releases/tag/v1.0.1
3641
[1.0.0]: https://github.com/pcolby/tap-summary/releases/tag/v1.0.0

action.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ runs:
2828
set -o errexit -o noclobber -o nounset -o pipefail
2929
[[ -z "$(shopt globstar 2> /dev/null)" ]] && echo 'Shell does not support globstar' || shopt -s globstar
3030
: "${SUMMARY_FILE:=$GITHUB_STEP_SUMMARY}"
31-
gawk --file "$GITHUB_ACTION_PATH/summary.gawk" --sandbox -- ${{ inputs.path }} >> "$SUMMARY_FILE"
31+
paths=(${{ inputs.path }}) # Expand globs, and trim whitespce.
32+
gawk --file "$GITHUB_ACTION_PATH/summary.gawk" --sandbox -- "${paths[@]}" >> "$SUMMARY_FILE"
3233
echo "summary-file=$SUMMARY_FILE" >> "$GITHUB_OUTPUT"
3334
shell: bash
3435
env:

0 commit comments

Comments
 (0)