Skip to content

Commit ba1a5b0

Browse files
authored
Merge pull request #32 from xt0rted/run-script-update
Bump run-script to 0.1.0-beta.152
2 parents 4790f76 + 2df4d34 commit ba1a5b0

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"run-script": {
6-
"version": "0.1.0-beta.139",
6+
"version": "0.1.0-beta.152",
77
"commands": [
88
"r"
99
]

.github/workflows/ci.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454

5555
- run: dotnet r build
5656

57-
- run: dotnet r test
57+
- run: dotnet r test -- --logger "trx;LogFilePrefix=${{ matrix.os }}"
5858

5959
- run: dotnet r pack -- --version-suffix ${{ env.VERSION_SUFFIX }}
6060

@@ -140,9 +140,15 @@ jobs:
140140
141141
- run: |
142142
if [ "${{ matrix.shell }}" == "default" ]; then
143-
dotnet r test --verbose -- --logger "trx;LogFilePrefix=${{ matrix.os }}-integration-tests"
143+
dotnet r test --verbose -- --logger "trx;LogFilePrefix=${{ matrix.os }}-default"
144144
else
145-
dotnet r test --verbose --script-shell "${{ matrix.shell }}" -- --logger "trx;LogFilePrefix=${{ matrix.os }}-integration-tests"
145+
shellName="${{ matrix.shell }}"
146+
147+
if [[ "$shellName" == *\.exe ]]; then
148+
shellName="bash"
149+
fi
150+
151+
dotnet r test --verbose --script-shell "${{ matrix.shell }}" -- --logger "trx;LogFilePrefix=${{ matrix.os }}-$shellName"
146152
fi
147153
shell: bash
148154

0 commit comments

Comments
 (0)