From 5d0b03a39cf9355c9f00d5436f14af05187e733d Mon Sep 17 00:00:00 2001
From: mob-sakai <12690315+mob-sakai@users.noreply.github.com>
Date: Sat, 23 Nov 2024 11:09:22 +0900
Subject: [PATCH] chore: update test workflow for PR

---
 .github/pull_request_template.md | 42 ++++++++++++++++++++++++++------
 .github/workflows/test.yml       | 36 ++++++++++++++++++++-------
 2 files changed, 62 insertions(+), 16 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 1afb10e7..54b49da8 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,9 +1,37 @@
----
-name: Pull Request
-about: Create a pull request
-title: ''
-assignees: mob-sakai
 
----
+# Pull Request Template
 
-**NOTE: Create a pull request to merge into `develop` branch**
+## Description
+
+- Please include a summary of the change and which issue is fixed.
+- Please also include relevant motivation and context.
+- List any dependencies that are required for this change.
+
+Fixes #{issue_number}
+
+## Type of change
+
+Please write the commit message in the format corresponding to the change type.
+Please see [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) for more information.
+
+- [ ] Bug fix (non-breaking change which fixes an issue)  
+- [ ] New feature (non-breaking change which adds functionality)  
+- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+- [ ] Update documentations
+- [ ] Others (refactoring, style changes, etc.)
+
+## Test environment
+
+- Platform: [e.g. Editor(Windows/Mac), Standalone(Windows/Mac), iOS, Android, WebGL]
+- Unity version: [e.g. 2022.2.0f1]
+- Build options: [e.g. IL2CPP, .Net 4.x, URP/HDRP]
+
+## Checklist
+
+- [ ] This pull request is for merging into the `develop` branch
+- [ ] My code follows the style guidelines of this project
+- [ ] I have performed a self-review of my own code
+- [ ] I have commented my code, particularly in hard-to-understand areas
+- [ ] I have made corresponding changes to the documentation
+- [ ] My changes generate no new warnings
+- [ ] I have checked my code and corrected any misspellings
\ No newline at end of file
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index bdff3122..6e62b8d4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -3,7 +3,7 @@
 #   UNITY_EMAIL: Unity user email to login
 #   UNITY_PASSWORD: Unity user password to login
 name: 🧪 Test
-run-name: 🧪 Test (${{ github.ref_name }})
+run-name: 🧪 Test (${{ github.event.pull_request.title || github.ref_name }})
 
 env:
   # MINIMUM_VERSION: The minimum version of Unity.
@@ -25,11 +25,14 @@ on:
     tags:
       - "!*"
     paths-ignore:
-      - "*.md"
-  pull_request:
+      - "**.md"
+  pull_request_target:
     types:
       - opened
+      - reopened
       - synchronize
+    paths-ignore:
+      - "**.md"
 
 jobs:
   setup:
@@ -56,10 +59,6 @@ jobs:
   test:
     name: 🧪 Run tests
     runs-on: ubuntu-latest
-    env:
-      UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
-      UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
-      UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
     permissions:
       checks: write
       contents: read
@@ -70,14 +69,29 @@ jobs:
       matrix:
         unityVersion: ${{ fromJson(needs.setup.outputs.unityVersions) }}
     steps:
-      - name: 🚚 Checkout
+      - name: 🚚 Checkout ($${{ github.ref }})
+        if: github.event_name == 'push'
         uses: actions/checkout@v4
 
+      - name: 🚚 Checkout pull request (pull_request_target)
+        if: github.event_name == 'pull_request_target'
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          fetch-depth: 0
+
+      - name: 🚚 Marge pull request (pull_request_target)
+        if: github.event_name == 'pull_request_target'
+        run: |
+          git config user.name "GitHub Actions"
+          git config user.email "actions@github.com"
+          git merge origin/${{ github.event.pull_request.base.ref }} --no-edit
+        
       - name: 📥 Cache library
         uses: actions/cache@v4
         with:
           path: Library
-          key: Library-${{ matrix.unityVersion }}-${{ github.sha }}
+          key: Library-${{ matrix.unityVersion }}-${{ github.event.pull_request.head.sha || github.sha }}
           restore-keys: |
             Library-${{ matrix.unityVersion }}-
             Library-
@@ -90,6 +104,10 @@ jobs:
           targetPlatform: StandaloneLinux64
           allowDirtyBuild: true
           customParameters: -nographics
+        env:
+          UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+          UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
+          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
 
       # - name: 🧪 Run tests
       #   uses: game-ci/unity-test-runner@v4