diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b823378..fee2c3b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,10 +27,10 @@ jobs: split_to: ${{ steps.summary.outputs.split_to }} steps: - name: 🚚 Checkout (${{ github.ref_name }}) - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: 🔖 Run semantic release - uses: cycjimmy/semantic-release-action@v4 + uses: cycjimmy/semantic-release-action@v5 id: release with: working_directory: Packages/src @@ -67,7 +67,7 @@ jobs: contents: write steps: - name: 🚚 Checkout (${{ needs.release.outputs.merge_to }}) - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: ref: ${{ needs.release.outputs.merge_to }} fetch-depth: 0 @@ -88,7 +88,7 @@ jobs: contents: write steps: - name: 🚚 Checkout (${{ needs.release.outputs.tag }}) - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: ref: ${{ needs.release.outputs.tag }} fetch-depth: 0 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d1dd4eb..839c884 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,6 +10,7 @@ env: MINIMUM_VERSION: 2019.4 # EXCLUDE_FILTER: The excluded versions of Unity. EXCLUDE_FILTER: "(2020.2.0|2021.1|2023.3)" + PROJECT_PATH: . on: workflow_dispatch: @@ -21,7 +22,7 @@ on: push: branches: - develop - - develop-preview + - "develop-*" tags: - "!*" paths-ignore: @@ -71,11 +72,11 @@ jobs: steps: - name: 🚚 Checkout ($${{ github.ref }}) if: github.event_name == 'push' - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: 🚚 Checkout pull request (pull_request_target) if: github.event_name == 'pull_request_target' - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 0 @@ -85,25 +86,27 @@ jobs: 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 + git rebase ${{ github.event.pull_request.base.sha }} + git log --oneline -n 10 - name: 📥 Cache library uses: actions/cache@v4 with: - path: Library - key: Library-${{ matrix.unityVersion }}-${{ github.event.pull_request.head.sha || github.sha }} + path: ${{ env.PROJECT_PATH }}/Library + key: ${{ env.PROJECT_PATH }}-Library-${{ matrix.unityVersion }}-${{ github.event.pull_request.head.sha || github.sha }} restore-keys: | - Library-${{ matrix.unityVersion }}- - Library- + ${{ env.PROJECT_PATH }}-Library-${{ matrix.unityVersion }}- + ${{ env.PROJECT_PATH }}-Library- - name: 🛠️ Build Unity Project (Test) - uses: game-ci/unity-builder@v4 + uses: game-ci/unity-builder@main timeout-minutes: 45 with: customImage: ghcr.io/mob-sakai/unity3d:${{ matrix.unityVersion }} targetPlatform: StandaloneLinux64 allowDirtyBuild: true customParameters: -nographics + projectPath: ${{ env.PROJECT_PATH }} env: UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }} UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} @@ -118,6 +121,7 @@ jobs: customParameters: -nographics checkName: ${{ matrix.unityVersion }} Test Results githubToken: ${{ github.token }} + projectPath: ${{ env.PROJECT_PATH }} env: UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }} UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}