Skip to content

Commit 4c8a346

Browse files
committed
Merge branch 'master' of https://github.com/Cysharp/ZString
2 parents a1e1471 + a0d7ac1 commit 4c8a346

File tree

1 file changed

+17
-41
lines changed

1 file changed

+17
-41
lines changed

.github/workflows/build-release.yml

Lines changed: 17 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,13 @@ on:
1212
default: false
1313
type: boolean
1414

15-
env:
16-
GIT_TAG: ${{ github.event.inputs.tag }}
17-
DRY_RUN: ${{ github.event.inputs.dry-run }}
18-
1915
jobs:
2016
update-packagejson:
2117
uses: Cysharp/Actions/.github/workflows/update-packagejson.yaml@main
2218
with:
2319
file-path: ./src/ZString.Unity/Assets/Scripts/ZString/package.json
24-
tag: ${{ github.event.inputs.tag }}
25-
dry-run: ${{ fromJson(github.event.inputs.dry-run) }}
20+
tag: ${{ inputs.tag }}
21+
dry-run: ${{ inputs.dry-run }}
2622

2723
build-dotnet:
2824
needs: [update-packagejson]
@@ -35,9 +31,9 @@ jobs:
3531
ref: ${{ needs.update-packagejson.outputs.sha }}
3632
- uses: Cysharp/Actions/.github/actions/setup-dotnet@main
3733
# pack nuget
38-
- run: dotnet build -c Release -p:Version=${{ env.GIT_TAG }}
34+
- run: dotnet build -c Release -p:Version=${{ inputs.tag }}
3935
- run: dotnet test tests/ZString.Tests -c Release --no-build
40-
- run: dotnet pack -c Release --no-build -p:Version=${{ env.GIT_TAG }} -o ./publish
36+
- run: dotnet pack -c Release --no-build -p:Version=${{ inputs.tag }} -o ./publish
4137
# Store artifacts.
4238
- uses: actions/upload-artifact@v2
4339
with:
@@ -63,7 +59,7 @@ jobs:
6359
UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
6460
UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
6561
UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
66-
UNITY_PACKAGE_VERSION: ${{ env.GIT_TAG }}
62+
UNITY_PACKAGE_VERSION: ${{ inputs.tag }}
6763
with:
6864
projectPath: src/ZString.Unity
6965
unityVersion: ${{ matrix.unity }}
@@ -77,43 +73,23 @@ jobs:
7773
# Store artifacts.
7874
- uses: actions/upload-artifact@v2
7975
with:
80-
name: ZString.Unity.${{ env.GIT_TAG }}.unitypackage
81-
path: ./src/ZString.Unity/ZString.Unity.${{ env.GIT_TAG }}.unitypackage
76+
name: ZString.Unity.${{ inputs.tag }}.unitypackage
77+
path: ./src/ZString.Unity/ZString.Unity.${{ inputs.tag }}.unitypackage
8278

8379
create-release:
84-
if: github.event.inputs.dry-run == 'false'
8580
needs: [update-packagejson, build-dotnet, build-unity]
86-
runs-on: ubuntu-latest
87-
timeout-minutes: 10
88-
steps:
89-
- uses: Cysharp/Actions/.github/actions/setup-dotnet@main
90-
# Create Release
91-
- uses: actions/create-release@v1
92-
id: create_release
93-
env:
94-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
95-
with:
96-
tag_name: ${{ env.GIT_TAG }}
97-
release_name: Ver.${{ env.GIT_TAG }}
98-
commitish: ${{ needs.update-packagejson.outputs.sha }}
99-
draft: true
100-
prerelease: false
101-
# Download (All) Artifacts to current directory
102-
- uses: actions/download-artifact@v2
103-
# Upload to NuGet
104-
- run: dotnet nuget push "./nuget/*.nupkg" --skip-duplicate -s https://www.nuget.org/api/v2/package -k ${{ secrets.NUGET_KEY }}
105-
# Upload to Releases(unitypackage)
106-
- uses: actions/upload-release-asset@v1
107-
env:
108-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
109-
with:
110-
upload_url: ${{ steps.create_release.outputs.upload_url }}
111-
asset_path: ./ZString.Unity.${{ env.GIT_TAG }}.unitypackage/ZString.Unity.${{ env.GIT_TAG }}.unitypackage
112-
asset_name: ZString.Unity.${{ env.GIT_TAG }}.unitypackage
113-
asset_content_type: application/octet-stream
81+
uses: Cysharp/Actions/.github/workflows/create-release.yaml@main
82+
with:
83+
commit-id: ${{ needs.update-packagejson.outputs.sha }}
84+
tag: ${{ inputs.tag }}
85+
dry-run: ${{ inputs.dry-run }}
86+
nuget-push: true
87+
release-upload: true
88+
release-asset-path: ./ZString.Unity.${{ inputs.tag }}.unitypackage/ZString.Unity.${{ inputs.tag }}.unitypackage
89+
secrets: inherit
11490

11591
cleanup:
116-
if: needs.update-packagejson.outputs.is-branch-created == 'true'
92+
if: ${{ needs.update-packagejson.outputs.is-branch-created == 'true' }}
11793
needs: [update-packagejson, build-dotnet, build-unity]
11894
uses: Cysharp/Actions/.github/workflows/clean-packagejson-branch.yaml@main
11995
with:

0 commit comments

Comments
 (0)