Skip to content

Commit

Permalink
Support new unity versioning scheme with regex matching groups (#264)
Browse files Browse the repository at this point in the history 
* Support new unity versioning scheme with regex matching groups

* Update github action packages

* Pin windows runner image version to 2022. Fix artifact name. Remove max-parallel cap for tests
  • Loading branch information
@AndrewKahr
AndrewKahr authored May 6, 2024
1 parent 75d0d76 commit fea469b
Show file tree
Hide file tree
Showing 5 changed files with 78 additions and 77 deletions.
120 changes: 59 additions & 61 deletions .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,10 @@ jobs:
runs-on: ${{ matrix.baseRunner }}
strategy:
fail-fast: false
max-parallel: 2
matrix:
baseRunner:
- ubuntu-latest
- windows-latest
- windows-2022
projectPath:
- unity-project-with-correct-tests
unityVersion:
Expand All @@ -58,7 +57,7 @@ jobs:
###########################
# Cache #
###########################
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ${{ matrix.projectPath }}/Library
key: Library-${{ matrix.baseRunner }}-${{ matrix.projectPath }}
Expand All @@ -72,9 +71,9 @@ jobs:
testMode: ${{ matrix.testMode }}
artifactsPath: ${{ matrix.testMode }}-artifacts
customParameters: -profile SomeProfile -someBoolean -someValue exampleValue
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: Test results for ${{ matrix.testMode }}
name: Test results for ${{ matrix.testMode }} (${{ matrix.baseRunner }}, ${{ matrix.unityVersion }})
path: ${{ steps.tests.outputs.artifactsPath }}
retention-days: 14

Expand All @@ -86,7 +85,7 @@ jobs:
matrix:
baseRunner:
- ubuntu-latest
- windows-latest
- windows-2022
projectPath:
- unity-project-with-correct-tests
unityVersion:
Expand All @@ -104,7 +103,7 @@ jobs:
###########################
# Cache #
###########################
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ${{ matrix.projectPath }}/Library
key: Library-${{ matrix.baseRunner }}-${{ matrix.projectPath }}
Expand All @@ -124,17 +123,17 @@ jobs:

# Upload artifacts
- name: Upload test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Test results (all)
name: Test results (all) (${{ matrix.baseRunner }}, ${{ matrix.unityVersion }})
path: ${{ steps.allTests.outputs.artifactsPath }}
retention-days: 14

# Upload coverage
- name: Upload coverage results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Coverage results (all)
name: Coverage results (all) (${{ matrix.baseRunner }}, ${{ matrix.unityVersion }})
path: ${{ steps.allTests.outputs.coveragePath }}
retention-days: 14

Expand All @@ -146,7 +145,7 @@ jobs:
matrix:
baseRunner:
- ubuntu-latest
- windows-latest
- windows-2022
unityVersion:
- 2022.3.13f1
- 2023.1.19f1
Expand All @@ -167,7 +166,7 @@ jobs:
###########################
# Cache #
###########################
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ${{ matrix.projectPath }}/Library
key: Library-${{ matrix.baseRunner }}-${{ matrix.projectPath }}
Expand All @@ -187,17 +186,17 @@ jobs:

# Upload artifacts
- name: Upload test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Test results (edit mode)
name: Test results (edit mode) (${{ matrix.baseRunner }}, ${{ matrix.unityVersion }}, ${{ matrix.runAsHostUser }})
path: ${{ steps.editMode.outputs.artifactsPath }}
retention-days: 14

# Upload coverage
- name: Upload coverage results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Coverage results (edit mode)
name: Coverage results (edit mode) (${{ matrix.baseRunner }}, ${{ matrix.unityVersion }}, ${{ matrix.runAsHostUser }})
path: ${{ steps.editMode.outputs.coveragePath }}
retention-days: 14

Expand All @@ -209,7 +208,7 @@ jobs:
matrix:
baseRunner:
- ubuntu-latest
- windows-latest
- windows-2022
projectPath:
- unity-project-with-correct-tests
unityVersion:
Expand All @@ -227,7 +226,7 @@ jobs:
###########################
# Cache #
###########################
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ${{ matrix.projectPath }}/Library
key: Library-${{ matrix.baseRunner }}-${{ matrix.projectPath }}
Expand All @@ -246,17 +245,17 @@ jobs:

# Upload artifacts
- name: Upload test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Test results (play mode)
name: Test results (play mode) (${{ matrix.baseRunner }}, ${{ matrix.unityVersion }})
path: ${{ steps.playMode.outputs.artifactsPath }}
retention-days: 14

# Upload coverage
- name: Upload coverage results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Coverage results (play mode)
name: Coverage results (play mode) (${{ matrix.baseRunner }}, ${{ matrix.unityVersion }})
path: ${{ steps.playMode.outputs.coveragePath }}
retention-days: 14

Expand All @@ -268,7 +267,7 @@ jobs:
matrix:
baseRunner:
- ubuntu-latest
- windows-latest
- windows-2022
projectPath:
- unity-project-with-correct-tests
unityVersion:
Expand All @@ -286,12 +285,11 @@ jobs:
###########################
# Cache #
###########################
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ${{ matrix.projectPath }}/Library
key: Library-${{ matrix.baseRunner }}-${{ matrix.projectPath }}-${{ matrix.targetPlatform }}
key: Library-${{ matrix.baseRunner }}-${{ matrix.projectPath }}
restore-keys: |
Library-${{ matrix.baseRunner }}-${{ matrix.projectPath }}-
Library-${{ matrix.baseRunner }}-
# Configure test runner
Expand All @@ -306,9 +304,9 @@ jobs:

# Upload artifacts
- name: Upload test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Test results (play mode)
name: Test results (play mode standalone) (${{ matrix.baseRunner }}, ${{ matrix.unityVersion }})
path: ${{ steps.standalone.outputs.artifactsPath }}
retention-days: 14

Expand All @@ -320,7 +318,7 @@ jobs:
matrix:
baseRunner:
- ubuntu-latest
- windows-latest
- windows-2022
projectPath:
- unity-project-with-correct-tests
unityVersion:
Expand All @@ -338,7 +336,7 @@ jobs:
###########################
# Cache #
###########################
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ${{ matrix.projectPath }}/Library
key: Library-${{ matrix.baseRunner }}-${{ matrix.projectPath }}
Expand All @@ -365,9 +363,9 @@ jobs:

# Upload artifacts
- name: Upload test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Test results (play mode)
name: Test results (play mode standalone il2cpp) (${{ matrix.baseRunner }}, ${{ matrix.unityVersion }})
path: ${{ steps.standalone.outputs.artifactsPath }}
retention-days: 14

Expand All @@ -379,7 +377,7 @@ jobs:
matrix:
baseRunner:
- ubuntu-latest
- windows-latest
- windows-2022
unityVersion:
- 2022.3.13f1
- 2023.1.19f1
Expand All @@ -397,7 +395,7 @@ jobs:
###########################
# Cache #
###########################
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ${{ matrix.projectPath }}/Library
key: Library-${{ matrix.baseRunner }}-${{ matrix.projectPath }}
Expand Down Expand Up @@ -433,9 +431,9 @@ jobs:

# Upload combined artifacts
- name: Upload combined test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Test results (combined)
name: Test results (combined sequential) (${{ matrix.baseRunner }}, ${{ matrix.unityVersion }})
path: artifacts/
retention-days: 14

Expand Down Expand Up @@ -474,9 +472,9 @@ jobs:
customParameters: -profile SomeProfile -someBoolean -someValue exampleValue
packageMode: true

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: Package test results for ${{ matrix.testMode }}
name: Package test results for ${{ matrix.testMode }} (${{ matrix.unityVersion }})
path: ${{ steps.packageTests.outputs.artifactsPath }}
retention-days: 14

Expand Down Expand Up @@ -514,17 +512,17 @@ jobs:

# Upload artifacts
- name: Upload test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Package test results (all)
name: Package test results (all) (${{ matrix.unityVersion }})
path: ${{ steps.packageAllTests.outputs.artifactsPath }}
retention-days: 14

# Upload coverage
- name: Upload coverage results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Package Coverage results (all)
name: Package Coverage results (all) (${{ matrix.unityVersion }})
path: ${{ steps.packageAllTests.outputs.coveragePath }}
retention-days: 14

Expand Down Expand Up @@ -562,17 +560,17 @@ jobs:

# Upload artifacts
- name: Upload test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Package test results (edit mode)
name: Package test results (edit mode) (${{ matrix.unityVersion }})
path: ${{ steps.packageEditMode.outputs.artifactsPath }}
retention-days: 14

# Upload coverage
- name: Upload coverage results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Package Coverage results (edit mode)
name: Package Coverage results (edit mode) (${{ matrix.unityVersion }})
path: ${{ steps.packageEditMode.outputs.coveragePath }}
retention-days: 14

Expand Down Expand Up @@ -610,17 +608,17 @@ jobs:

# Upload artifacts
- name: Upload test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Package test results (play mode)
name: Package test results (play mode) (${{ matrix.unityVersion }})
path: ${{ steps.packagePlayMode.outputs.artifactsPath }}
retention-days: 14

# Upload coverage
- name: Upload coverage results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Package Coverage results (play mode)
name: Package Coverage results (play mode) (${{ matrix.unityVersion }})
path: ${{ steps.packagePlayMode.outputs.coveragePath }}
retention-days: 14

Expand Down Expand Up @@ -666,9 +664,9 @@ jobs:

# Upload combined artifacts
- name: Upload combined test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Package test results (combined)
name: Package test results (combined sequential) (${{ matrix.unityVersion }})
path: packageArtifacts/
retention-days: 14

Expand Down Expand Up @@ -708,17 +706,17 @@ jobs:

# Upload artifacts
- name: Upload test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Package test results (all)
name: Package test results (Scope Registry) (${{ matrix.unityVersion }})
path: ${{ steps.packageAllTests.outputs.artifactsPath }}
retention-days: 14

# Upload coverage
- name: Upload coverage results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Package Coverage results (all)
name: Package Coverage results (Scope Registry) (${{ matrix.unityVersion }})
path: ${{ steps.packageAllTests.outputs.coveragePath }}
retention-days: 14

Expand Down Expand Up @@ -758,16 +756,16 @@ jobs:

# Upload artifacts
- name: Upload test results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Package test results (all)
name: Package test results (Multi Scope Regristy) (${{ matrix.unityVersion }})
path: ${{ steps.packageAllTests.outputs.artifactsPath }}
retention-days: 14

# Upload coverage
- name: Upload coverage results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Package Coverage results (all)
name: Package Coverage results (Multi Scope Registry) (${{ matrix.unityVersion }})
path: ${{ steps.packageAllTests.outputs.coveragePath }}
retention-days: 14
Loading

0 comments on commit fea469b

Please sign in to comment.