Skip to content

Commit

Permalink
Merge pull request #715 from Cysharp/guitarrapc-patch-1
Browse files Browse the repository at this point in the history
Update action.yaml to use Cysharp/Actions/setup-dotnet
  • Loading branch information
mayuki authored Nov 28, 2023
2 parents fa05186 + 0975a18 commit 5426e1f
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 11 deletions.
6 changes: 1 addition & 5 deletions .github/actions/setup-dotnet/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@ name: Setup .NET SDKs
runs:
using: "composite"
steps:
- uses: actions/setup-dotnet@v2
with:
dotnet-version: |
6.0.x
7.0.x
- uses: Cysharp/Actions/.github/actions/setup-dotnet@main
- name: "Prepare Environment Variables (.NET SDK)"
shell: bash
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-canary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
timeout-minutes: 10
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/setup-dotnet
- uses: Cysharp/Actions/.github/actions/setup-dotnet@main
- run: echo "MAGICONION_VERSION=ci-$(date '+%Y%m%d-%H%M%S')+${GITHUB_SHA:0:6}" >> $GITHUB_ENV
- run: echo "MAGICONION_VERSION=${MAGICONION_VERSION}"
# build
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
timeout-minutes: 10
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/setup-dotnet
- uses: Cysharp/Actions/.github/actions/setup-dotnet@main
- run: dotnet build -c ${{ env.BUILD_CONFIG }} ./MagicOnion.sln

run-tests:
Expand All @@ -29,7 +29,7 @@ jobs:
timeout-minutes: 10
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/setup-dotnet
- uses: Cysharp/Actions/.github/actions/setup-dotnet@main
- run: dotnet test -c Debug MagicOnion.sln
- run: dotnet test -c Release MagicOnion.sln

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
- uses: actions/checkout@v3
with:
ref: ${{ needs.update-packagejson.outputs.sha }}
- uses: ./.github/actions/setup-dotnet
- uses: Cysharp/Actions/.github/actions/setup-dotnet@main
- name: Publish MagicOnion.Client.SourceGenerator.Unity
run: dotnet publish -c ${{ env.BUILD_CONFIG }} -c Release ./src/MagicOnion.Client.SourceGenerator.Unity -o ./src/MagicOnion.Client.Unity/Assets/Scripts/MagicOnion/MagicOnion.Client/MagicOnion.Client.SourceGenerator.Unity
- name: Remove .deps.json and .pdbs
Expand Down Expand Up @@ -136,7 +136,7 @@ jobs:
- uses: actions/checkout@v3
with:
ref: ${{ needs.update-packagejson.outputs.sha }}
- uses: ./.github/actions/setup-dotnet
- uses: Cysharp/Actions/.github/actions/setup-dotnet@main
- run: dotnet build -c ${{ env.BUILD_CONFIG }} ./MagicOnion.sln
# pack nuget
- run: dotnet pack -c ${{ env.BUILD_CONFIG }} ./MagicOnion.Packaging.slnf --include-symbols --include-source --no-build -o ./publish
Expand Down Expand Up @@ -190,7 +190,7 @@ jobs:
- uses: actions/checkout@v3
with:
ref: ${{ needs.update-packagejson.outputs.sha }}
- uses: ./.github/actions/setup-dotnet
- uses: Cysharp/Actions/.github/actions/setup-dotnet@main
# Create Release
- uses: actions/create-release@v1
id: create_release
Expand Down

0 comments on commit 5426e1f

Please sign in to comment.