Skip to content

Commit

Permalink
Add support for non-preferred block scalars
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
pcolby committed Feb 16, 2024
1 parent 4cd6558 commit 0959cbe
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 3 deletions.
16 changes: 16 additions & 0 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,22 @@ jobs:
path: >-
./test/qtpokit-2554496971/test-results-linux-clang/test/unit/*.tap
./test/qtpokit-2554496971/test-results-linux-gcc/test/unit/*.tap
id: scalar
- name: Check result
run: diff ${EXTRA_DIFF_ARGS:-} --unified ./.github/workflows/expected/path.md "$SUMMARY_FILE"
shell: bash
env:
SUMMARY_FILE: ${{ steps.scalar.outputs.summary-file }}

- name: Reset step summary
run: '> "$GITHUB_STEP_SUMMARY"'
shell: bash
- name: Test block scalars with new lines
uses: ./
with:
path: |
./test/qtpokit-2554496971/test-results-linux-clang/test/unit/*.tap
./test/qtpokit-2554496971/test-results-linux-gcc/test/unit/*.tap
id: path
- name: Check result
run: diff ${EXTRA_DIFF_ARGS:-} --unified ./.github/workflows/expected/path.md "$SUMMARY_FILE"
Expand Down
9 changes: 7 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]
## [1.1.1] (2024-02-16)

### Added

- Support for non-preferred block scalars (eg `|` or `>+` instead of `>-`).

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

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

[unreleased]: https://github.com/pcolby/tap-summary/compare/v1.1.0...HEAD
[unreleased]: https://github.com/pcolby/tap-summary/compare/v1.1.1...HEAD
[1.1.1]: https://github.com/pcolby/tap-summary/releases/tag/v1.1.1
[1.1.0]: https://github.com/pcolby/tap-summary/releases/tag/v1.1.0
[1.0.1]: https://github.com/pcolby/tap-summary/releases/tag/v1.0.1
[1.0.0]: https://github.com/pcolby/tap-summary/releases/tag/v1.0.0
Expand Down
3 changes: 2 additions & 1 deletion action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ runs:
set -o errexit -o noclobber -o nounset -o pipefail
[[ -z "$(shopt globstar 2> /dev/null)" ]] && echo 'Shell does not support globstar' || shopt -s globstar
: "${SUMMARY_FILE:=$GITHUB_STEP_SUMMARY}"
gawk --file "$GITHUB_ACTION_PATH/summary.gawk" --sandbox -- ${{ inputs.path }} >> "$SUMMARY_FILE"
paths=(${{ inputs.path }}) # Expand globs, and trim whitespce.
gawk --file "$GITHUB_ACTION_PATH/summary.gawk" --sandbox -- "${paths[@]}" >> "$SUMMARY_FILE"
echo "summary-file=$SUMMARY_FILE" >> "$GITHUB_OUTPUT"
shell: bash
env:
Expand Down

0 comments on commit 0959cbe

Please sign in to comment.