Skip to content

Commit 3e2fdd5

Browse files
committed
bump workflows/test up to v1.1.2
1 parent 155f005 commit 3e2fdd5

File tree

2 files changed

+28
-10
lines changed

2 files changed

+28
-10
lines changed

.github/workflows/test-packages.yml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
required: false
1515
type: string
1616
os:
17-
description: "The OS label which run the test on. (ex: ubuntu-latest, windows-latest, macos-latest)"
17+
description: "The OS label which run the test on. (ex: ubuntu-22.04, ubuntu-20.04, windows-latest, macos-latest)"
1818
required: false
1919
type: string
2020
verbose:
@@ -27,7 +27,10 @@ jobs:
2727
prerequisites:
2828
runs-on: ubuntu-latest
2929
outputs:
30+
os: ${{ steps.input-prerequisites.outputs.os }}
3031
verbose: ${{ steps.input-prerequisites.outputs.verbose }}
32+
env:
33+
RUNS_ON_OS_LIST_DEFAULT: 'ubuntu-22.04, ubuntu-20.04, windows-latest, macos-latest'
3134
steps:
3235
- name: Delay until the package is published
3336
run: |
@@ -40,18 +43,24 @@ jobs:
4043
- name: Determine prerequisites
4144
id: input-prerequisites
4245
run: |
46+
if [ -z '${{ github.event.inputs.os }}' ]; then
47+
echo "os=${RUNS_ON_OS_LIST_DEFAULT}" >> $GITHUB_OUTPUT
48+
else
49+
echo 'os=${{ github.event.inputs.os }}' >> $GITHUB_OUTPUT
50+
fi
51+
4352
if [ '${{ github.event.inputs.verbose }}' = 'true' ]; then
44-
echo '::set-output name=verbose::true'
53+
echo 'verbose=true' >> $GITHUB_OUTPUT
4554
else
46-
echo '::set-output name=verbose::false'
55+
echo 'verbose=false' >> $GITHUB_OUTPUT
4756
fi
4857
4958
run-test:
50-
uses: smdn/Smdn.Fundamentals/.github/workflows/test.yml@workflows/test-v1.0.5
59+
uses: smdn/Smdn.Fundamentals/.github/workflows/test.yml@workflows/test-v1.1.2
5160
needs: prerequisites
5261
with:
5362
project: ${{ github.event.inputs.project }}
54-
os: ${{ github.event.inputs.os }}
63+
os: ${{ needs.prerequisites.outputs.os }}
5564
extra_options_common: '/p:TestReleasedPackage=true'
5665
verbose: ${{ fromJSON(needs.prerequisites.outputs.verbose) }}
5766
dotnet_sdk_version: '6.0.200'

.github/workflows/test.yml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ on:
2727
required: false
2828
type: string
2929
os:
30-
description: "The OS label which run the test on. (ex: ubuntu-latest, windows-latest, macos-latest)"
30+
description: "The OS label which run the test on. (ex: ubuntu-22.04, ubuntu-20.04, windows-latest, macos-latest)"
3131
required: false
3232
type: string
3333
verbose:
@@ -40,23 +40,32 @@ jobs:
4040
prerequisites:
4141
runs-on: ubuntu-latest
4242
outputs:
43+
os: ${{ steps.input-prerequisites.outputs.os }}
4344
verbose: ${{ steps.input-prerequisites.outputs.verbose }}
45+
env:
46+
RUNS_ON_OS_LIST_DEFAULT: 'ubuntu-22.04, ubuntu-20.04, windows-latest, macos-latest'
4447
steps:
4548
- name: Determine prerequisites
4649
id: input-prerequisites
4750
run: |
51+
if [ -z '${{ github.event.inputs.os }}' ]; then
52+
echo "os=${RUNS_ON_OS_LIST_DEFAULT}" >> $GITHUB_OUTPUT
53+
else
54+
echo 'os=${{ github.event.inputs.os }}' >> $GITHUB_OUTPUT
55+
fi
56+
4857
if [ '${{ github.event.inputs.verbose }}' = 'true' ]; then
49-
echo '::set-output name=verbose::true'
58+
echo 'verbose=true' >> $GITHUB_OUTPUT
5059
else
51-
echo '::set-output name=verbose::false'
60+
echo 'verbose=false' >> $GITHUB_OUTPUT
5261
fi
5362
5463
run-test:
55-
uses: smdn/Smdn.Fundamentals/.github/workflows/test.yml@workflows/test-v1.0.5
64+
uses: smdn/Smdn.Fundamentals/.github/workflows/test.yml@workflows/test-v1.1.2
5665
needs: prerequisites
5766
with:
5867
project: ${{ github.event.inputs.project }}
59-
os: ${{ github.event.inputs.os }}
68+
os: ${{ needs.prerequisites.outputs.os }}
6069
verbose: ${{ fromJSON(needs.prerequisites.outputs.verbose) }}
6170
dotnet_sdk_version: '6.0.200'
6271
timeout_hang: "[ {'OS':'windows','Timeout':'6min'}, {'OS':'macos','Timeout':'3min'}, {'OS':'','Timeout':'1min'} ]"

0 commit comments

Comments
 (0)