From 6d6f6d101c2364f7bb567adc44134bbe002baf4d Mon Sep 17 00:00:00 2001 From: Koji Hasegawa Date: Sat, 16 Dec 2023 03:14:30 +0900 Subject: [PATCH] Fix test workflows - Add email and password to unity-test-runner - Upgrade Unity versions running on workflows (cherry picked from commit 3385efbcec1cf48a4cb8b2f12f00c0034e4021ad) --- .github/workflows/test-integration.yml | 13 ++++++++----- .github/workflows/test.yml | 15 +++++++++------ 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml index 46c3dbe..a80eb46 100644 --- a/.github/workflows/test-integration.yml +++ b/.github/workflows/test-integration.yml @@ -24,6 +24,7 @@ concurrency: jobs: test: + if: github.event.pull_request.head.repo.fork == false # Skip on public fork, because can not read secrets. runs-on: ${{ github.event.inputs.runner }} permissions: contents: read @@ -32,9 +33,9 @@ jobs: fail-fast: false matrix: unityVersion: # Available versions see: https://game.ci/docs/docker/versions - - 2021.3.31f1 - - 2022.3.12f1 - - 2023.1.18f1 + - 2021.3.33f1 + - 2022.3.15f1 + - 2023.2.3f1 steps: - name: Checkout repository @@ -61,7 +62,7 @@ jobs: run: echo "secret_key=UNITY_LICENSE_$(echo ${{ matrix.unityVersion }} | cut -c 1-4)" >> "$GITHUB_ENV" - name: Run tests - uses: game-ci/unity-test-runner@v3 + uses: game-ci/unity-test-runner@v4 with: githubToken: ${{ secrets.GITHUB_TOKEN }} unityVersion: ${{ matrix.unityVersion }} # Default is `auto` @@ -71,6 +72,8 @@ jobs: # see: https://docs.unity3d.com/Packages/com.unity.testtools.codecoverage@1.2/manual/CoverageBatchmode.html env: UNITY_LICENSE: ${{ secrets[env.secret_key] }} + UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }} + UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} id: test - name: Upload test results @@ -84,10 +87,10 @@ jobs: notify: needs: test + if: github.event.pull_request.head.repo.fork == false # Skip on public fork, because can not read secrets. runs-on: ubuntu-latest permissions: actions: read - if: always() steps: - uses: Gamesight/slack-workflow-status@v1.2.0 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b135e84..093595f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,6 +24,7 @@ concurrency: jobs: test: + if: github.event.pull_request.head.repo.fork == false # Skip on public fork, because can not read secrets. runs-on: ubuntu-latest permissions: contents: read @@ -33,11 +34,11 @@ jobs: fail-fast: false matrix: unityVersion: # Available versions see: https://game.ci/docs/docker/versions - - 2021.3.31f1 - - 2022.3.12f1 - - 2023.1.18f1 + - 2021.3.33f1 + - 2022.3.15f1 + - 2023.2.3f1 include: - - unityVersion: 2021.3.31f1 + - unityVersion: 2021.3.33f1 octocov: true steps: @@ -65,7 +66,7 @@ jobs: run: echo "secret_key=UNITY_LICENSE_$(echo ${{ matrix.unityVersion }} | cut -c 1-4)" >> "$GITHUB_ENV" - name: Run tests - uses: game-ci/unity-test-runner@v3 + uses: game-ci/unity-test-runner@v4 with: githubToken: ${{ secrets.GITHUB_TOKEN }} unityVersion: ${{ matrix.unityVersion }} # Default is `auto` @@ -75,6 +76,8 @@ jobs: # see: https://docs.unity3d.com/Packages/com.unity.testtools.codecoverage@1.2/manual/CoverageBatchmode.html env: UNITY_LICENSE: ${{ secrets[env.secret_key] }} + UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }} + UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} id: test - name: Set coverage path for octocov @@ -96,10 +99,10 @@ jobs: notify: needs: test + if: github.event.pull_request.head.repo.fork == false # Skip on public fork, because can not read secrets. runs-on: ubuntu-latest permissions: actions: read - if: always() steps: - uses: Gamesight/slack-workflow-status@v1.2.0