Skip to content

Commit 9e53828

Browse files
Merge pull request #62 from Stillpoint-Software/develop
Updated github actions
2 parents de67e7e + d5d0f50 commit 9e53828

File tree

4 files changed

+18
-9
lines changed

4 files changed

+18
-9
lines changed

.github/workflows/Format.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
branches: [main, develop]
99

1010
workflow_run:
11-
workflows: [Create Prerelease, Create Release]
11+
workflows: [Create Release]
1212
types: [requested]
1313

1414
permissions:

.github/workflows/create_release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ jobs:
4444
VERSION='${{ inputs.version }}'
4545
INCR='${{ inputs.increment }}'
4646
if [[ "$MODE" == "explicit" && -z "$VERSION" ]]; then
47-
echo " mode=explicit requires 'version' (e.g., 1.3-alpha)."; exit 1
47+
echo "? mode=explicit requires 'version' (e.g., 1.3-alpha)."; exit 1
4848
fi
4949
if [[ "$MODE" == "bump" && -z "$INCR" ]]; then
50-
echo " mode=bump requires 'increment' (major|minor|patch)."; exit 1
50+
echo "? mode=bump requires 'increment' (major|minor|patch)."; exit 1
5151
fi
52-
echo " inputs look good."
52+
echo "? inputs look good."
5353
5454
set-version:
5555
needs: validate-inputs

.github/workflows/pack_publish.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,26 @@ jobs:
1818
target_branch: ${{ github.event.release.target_commitish }}
1919
override_build_configuration: ''
2020
prerelease: ${{ github.event.release.prerelease }} # true/false from the release
21-
22-
publish:
21+
22+
tests:
2323
needs: set-config
24+
uses: Stillpoint-Software/shared-workflows/.github/workflows/run_tests.yml@main
25+
with:
26+
branch: ${{ github.event.release.target_commitish }}
27+
solution_name: ${{ vars.SOLUTION_NAME }}
28+
29+
publish:
30+
needs: [set-config, tests]
2431
uses: Stillpoint-Software/shared-workflows/.github/workflows/pack_and_publish.yml@main
2532
with:
2633
build_configuration: ${{ needs.set-config.outputs.build_configuration }}
2734
secrets:
2835
NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
36+
2937
result:
30-
needs: [publish]
38+
needs: [publish, tests]
3139
if: always()
3240
runs-on: ubuntu-latest
3341
steps:
34-
- run: echo "Pack & Publish result = ${{ needs.publish.result }}"
42+
- run: echo "Tests result = ${{ needs.tests.result }}"
43+
- run: echo "Pack & Publish result = ${{ needs.publish.result }}"

.github/workflows/run_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Run Tests
22

33
on:
44
workflow_run:
5-
workflows: [Create Prerelease, Create Release]
5+
workflows: [Create Release]
66
types: [requested]
77
branches: [main, develop]
88
workflow_dispatch:

0 commit comments

Comments
 (0)