From 549a3855029a3ee99f46c52dd9b0f41e79413243 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 1/2] chore: update test workflow for PR --- .github/pull_request_template.md | 42 ++++++++++++++++++++++++++------ .github/workflows/test.yml | 34 ++++++++++++++++++++------ 2 files changed, 62 insertions(+), 14 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..b0896683 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,13 +59,11 @@ 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 + pull-requests: write + secrets: read needs: setup strategy: fail-fast: false @@ -71,8 +72,23 @@ jobs: unityVersion: ${{ fromJson(needs.setup.outputs.unityVersions) }} steps: - name: ๐Ÿšš Checkout + 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: @@ -90,6 +106,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 From e23d39746aab72d01965db2b80569e202471862f Mon Sep 17 00:00:00 2001 From: tajima-yahoo <42268363+tajima-yahoo@users.noreply.github.com> Date: Sat, 23 Nov 2024 12:56:53 +0900 Subject: [PATCH 2/2] Update UIEffect.cs --- Packages/src/Runtime/UIEffect.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Packages/src/Runtime/UIEffect.cs b/Packages/src/Runtime/UIEffect.cs index 0f35de8e..a58dbe74 100644 --- a/Packages/src/Runtime/UIEffect.cs +++ b/Packages/src/Runtime/UIEffect.cs @@ -3,6 +3,7 @@ using UnityEngine; using UnityEngine.Rendering; +/// namespace Coffee.UIEffects { [ExecuteAlways]