From cc22bbf95619e091c0072d3d8dff02606e15817a Mon Sep 17 00:00:00 2001 From: Ikiru Yoshizaki <3856350+guitarrapc@users.noreply.github.com> Date: Wed, 15 Nov 2023 11:54:05 +0900 Subject: [PATCH 1/4] Update action.yaml to use Cysharp/Actions/setup-dotnet --- .github/actions/setup-dotnet/action.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/actions/setup-dotnet/action.yaml b/.github/actions/setup-dotnet/action.yaml index a4c8b5c0e..a7ebea0af 100644 --- a/.github/actions/setup-dotnet/action.yaml +++ b/.github/actions/setup-dotnet/action.yaml @@ -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: | From 198c6787cf1c344ed9e8ca89b3c1682799e67f1e Mon Sep 17 00:00:00 2001 From: Ikiru Yoshizaki <3856350+guitarrapc@users.noreply.github.com> Date: Wed, 15 Nov 2023 12:11:19 +0900 Subject: [PATCH 2/4] Update build-canary.yml --- .github/workflows/build-canary.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-canary.yml b/.github/workflows/build-canary.yml index b7d39d4d8..a85de365d 100644 --- a/.github/workflows/build-canary.yml +++ b/.github/workflows/build-canary.yml @@ -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 From fa04d67c79da328e3ee8550eb4d9b24ba7c119a9 Mon Sep 17 00:00:00 2001 From: Ikiru Yoshizaki <3856350+guitarrapc@users.noreply.github.com> Date: Wed, 15 Nov 2023 12:11:49 +0900 Subject: [PATCH 3/4] Update build-debug.yml --- .github/workflows/build-debug.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-debug.yml b/.github/workflows/build-debug.yml index 56df509eb..70337203d 100644 --- a/.github/workflows/build-debug.yml +++ b/.github/workflows/build-debug.yml @@ -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: @@ -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 From 0975a18dc538491c375130ecffb5554662410c13 Mon Sep 17 00:00:00 2001 From: Ikiru Yoshizaki <3856350+guitarrapc@users.noreply.github.com> Date: Wed, 15 Nov 2023 12:12:21 +0900 Subject: [PATCH 4/4] Update build-release.yml --- .github/workflows/build-release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index ccfb63df2..d9b7c9afd 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -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 @@ -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 @@ -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