Skip to content

Commit 913062b

Browse files
committed
fix: CI sample import
1 parent 6183a21 commit 913062b

3 files changed

Lines changed: 20 additions & 4 deletions

File tree

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
m_EditorVersion: 6000.3.9f1
2-
m_EditorVersionWithRevision: 6000.3.9f1 (7a9955a4f2fa)
1+
m_EditorVersion: 6000.5.0f1

.gitattributes

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
*.sh text eol=lf
2+
*.yml text eol=lf
3+
*.yaml text eol=lf
4+
*.txt text eol=lf

.github/workflows/build-and-test.yml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ jobs:
7575
UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
7676
with:
7777
projectPath: .ci/unity-project
78-
unityVersion: 6000.3.9f1
78+
unityVersion: 6000.5.0f1
79+
customImage: unityci/editor:ubuntu-6000.5.0f1-base-3
7980
testMode: EditMode
8081
customParameters: -assemblyNames FixedMathSharp.Unity.Tests.EditMode -runSynchronously
8182
artifactsPath: artifacts/${{ matrix.artifact_suffix }}
@@ -133,10 +134,21 @@ jobs:
133134
uses: actions/cache@v5
134135
with:
135136
path: .ci/unity-sample-import-${{ matrix.artifact_suffix }}/Library
136-
key: unity-sample-import-library-${{ runner.os }}-${{ matrix.artifact_suffix }}-${{ hashFiles('com.mrdav30.fixedmathsharp/package.json', 'com.mrdav30.fixedmathsharp/Samples~/**', 'com.mrdav30.fixedmathsharp.lean/package.json', 'com.mrdav30.fixedmathsharp.lean/Samples~/**') }}
137+
key: unity-sample-import-library-${{ runner.os }}-${{ matrix.artifact_suffix }}-${{ hashFiles('.assets/ci/scripts/prepare-unity-sample-import-smoke.sh', '.assets/ci/unity-sample-import-smoke/**', 'com.mrdav30.fixedmathsharp/package.json', 'com.mrdav30.fixedmathsharp/Samples~/**', 'com.mrdav30.fixedmathsharp.lean/package.json', 'com.mrdav30.fixedmathsharp.lean/Samples~/**') }}
137138
restore-keys: |
138139
unity-sample-import-library-${{ runner.os }}-${{ matrix.artifact_suffix }}-
139140
141+
- name: Trust local Git checkout inside Unity container
142+
shell: bash
143+
run: |
144+
set -euo pipefail
145+
146+
container_home="$RUNNER_TEMP/_github_home"
147+
mkdir -p "$container_home"
148+
149+
git config --file "$container_home/.gitconfig" --add safe.directory /github/workspace
150+
git config --file "$container_home/.gitconfig" --add safe.directory /github/workspace/.git
151+
140152
- name: Run Unity sample import smoke
141153
id: sample-import
142154
uses: game-ci/unity-test-runner@v4
@@ -147,6 +159,7 @@ jobs:
147159
with:
148160
projectPath: .ci/unity-sample-import-${{ matrix.artifact_suffix }}
149161
unityVersion: 6000.5.0f1
162+
customImage: unityci/editor:ubuntu-6000.5.0f1-base-3
150163
testMode: EditMode
151164
customParameters: -assemblyNames FixedMathSharp.SampleImportSmokeTests -runSynchronously
152165
artifactsPath: artifacts/sample-import-${{ matrix.artifact_suffix }}

0 commit comments

Comments
 (0)