Skip to content

Commit 839c243

Browse files
committed
Merge branch 'develop'
2 parents ac46ca8 + c54032e commit 839c243

File tree

6 files changed

+84
-8
lines changed

6 files changed

+84
-8
lines changed

.github/workflows/activation.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Acquire activation file 🔑
2+
on:
3+
workflow_dispatch: {}
4+
jobs:
5+
activation:
6+
name: Request manual activation file 🔑
7+
runs-on: ubuntu-latest
8+
steps:
9+
# Request manual activation file
10+
- name: Request manual activation file
11+
id: getManualLicenseFile
12+
uses: game-ci/unity-request-activation-file@v2
13+
# Upload artifact (Unity_v20XX.X.XXXX.alf)
14+
- name: Expose as artifact
15+
uses: actions/upload-artifact@v2
16+
with:
17+
name: ${{ steps.getManualLicenseFile.outputs.filePath }}
18+
path: ${{ steps.getManualLicenseFile.outputs.filePath }}

.github/workflows/test.yml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: Run TestRunner 📝
2+
3+
on: pull_request
4+
5+
env:
6+
UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
7+
8+
jobs:
9+
testRunner:
10+
name: Test all modes 📝
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Checkout code
14+
uses: actions/checkout@v2
15+
16+
- name: Create LFS file list
17+
run: git lfs ls-files -l | cut -d' ' -f1 | sort > .lfs-assets-id
18+
19+
- name: Restore LFS cache
20+
uses: actions/cache@v2
21+
id: lfs-cache
22+
with:
23+
path: .git/lfs
24+
key: ${{ runner.os }}-lfs-${{ hashFiles('.lfs-assets-id') }}
25+
26+
- name: Git LFS Pull
27+
run: |
28+
git lfs pull
29+
git add .
30+
git reset --hard
31+
32+
- name: Restore Library cache
33+
uses: actions/cache@v2
34+
with:
35+
path: Library
36+
key: Library-test-project
37+
restore-keys: |
38+
Library-test-project-
39+
Library-
40+
41+
- uses: game-ci/unity-test-runner@v2
42+
id: testRunner
43+
with:
44+
testMode: all
45+
46+
- uses: actions/upload-artifact@v2
47+
with:
48+
name: Test results (all modes)
49+
path: ${{ steps.testRunner.outputs.artifactsPath }}
File renamed without changes.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
[Bb]uild/
99
[Bb]uilds/
1010
[Ll]ogs/
11+
[Uu]serSettings/
1112

1213
# Never ignore Asset meta data
1314
![Aa]ssets/**/*.meta

Assets/Editor Toolbox/README.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,14 @@ Unity 2018.x or newer
2222

2323
- Install Editor Toolbox package:
2424
- 1 way: Find Unity Package Manager (Window/Package Manager) and add package using this git URL:
25-
```https://github.com/arimger/Unity-Editor-Toolbox.git#upm```
26-
- 2 way: Copy and paste `Editor Toolbox` directory into your project (Assets/...) + add dependencies
27-
- 3 way: Install via [OpenUpm registry](https://openupm.com):
28-
```openupm add com.browar.editor-toolbox```
25+
```
26+
https://github.com/arimger/Unity-Editor-Toolbox.git#upm
27+
```
28+
- 2 way: Copy and paste `Assets/Editor Toolbox` directory into your project (Assets/...) + add dependencies
29+
- 3 way: Install via [OpenUPM registry](https://openupm.com):
30+
```
31+
openupm add com.browar.editor-toolbox
32+
```
2933
- Open Edit/Project Settings/Editor Toolbox window
3034
- If settings file is not found, press the "Refresh" button or create a new one
3135
- Manage settings in your way

README.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,14 @@ Unity 2018.x or newer
2222

2323
- Install Editor Toolbox package:
2424
- 1 way: Find Unity Package Manager (Window/Package Manager) and add package using this git URL:
25-
```https://github.com/arimger/Unity-Editor-Toolbox.git#upm```
26-
- 2 way: Copy and paste `Editor Toolbox` directory into your project (Assets/...) + add dependencies
27-
- 3 way: Install via [OpenUpm registry](https://openupm.com):
28-
```openupm add com.browar.editor-toolbox```
25+
```
26+
https://github.com/arimger/Unity-Editor-Toolbox.git#upm
27+
```
28+
- 2 way: Copy and paste `Assets/Editor Toolbox` directory into your project (Assets/...) + add dependencies
29+
- 3 way: Install via [OpenUPM registry](https://openupm.com):
30+
```
31+
openupm add com.browar.editor-toolbox
32+
```
2933
- Open Edit/Project Settings/Editor Toolbox window
3034
- If settings file is not found, press the "Refresh" button or create a new one
3135
- Manage settings in your way

0 commit comments

Comments
 (0)