Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
- fixed `unity-version` not properly overriding version in `version-file`.
- fixed `version-file` not properly being found when using relative paths.
- optimized TargetAndroidSDK installation.
  • Loading branch information
StephenHodgson authored Aug 7, 2024
1 parent e85cf27 commit eee7a67
Show file tree
Hide file tree
Showing 11 changed files with 29,180 additions and 29,847 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/validate.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
name: validate
on:
schedule:
- cron: '0 0 * * 0' # Run every Sunday at midnight
push:
branches:
- 'main'
Expand All @@ -24,6 +26,7 @@ jobs:
matrix:
os: [ubuntu-latest, windows-latest, macos-13, macos-latest]
unity-versions:
- 'in version file'
- 2019.4.40f1 (ffc62b691db5)
- 2020.3.48f1 (b805b124c6b7)
- 2021.3.41f1 (6c5a9e20c022)
Expand Down Expand Up @@ -52,8 +55,8 @@ jobs:

- uses: ./ # RageAgainstThePixel/unity-setup
with:
# version-file: 'com.utilities.buildpipline/Utilities.BuildPipeline/ProjectSettings/ProjectVersion.txt'
unity-version: ${{ matrix.unity-versions }} # overrides the version in the version file
version-file: com.utilities.buildpipline/Utilities.BuildPipeline/ProjectSettings/ProjectVersion.txt
unity-version: ${{ matrix.unity-versions }}
build-targets: ${{ matrix.build-targets }}
modules: ${{ matrix.modules }}

Expand Down
10 changes: 8 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,13 @@ A GitHub Action for setting up the [Unity Game Engine](https://unity.com) on Git
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-13, macos-latest]
unity-versions: [2020.3.48f1 (b805b124c6b7), 2021.3.41f1 (6c5a9e20c022), 2022.3.40f1 (cbdda657d2f0)]
unity-versions:
- 'in version file'
- 2019.4.40f1 (ffc62b691db5)
- 2020.3.48f1 (b805b124c6b7)
- 2021.3.41f1 (6c5a9e20c022)
- 2022.3.40f1 (cbdda657d2f0)
- 6000.0.13f1 (53a692e3fca9)
include:
- os: ubuntu-latest
build-targets: StandaloneLinux64, Android, iOS
Expand Down Expand Up @@ -45,7 +51,7 @@ steps:
| ----------- | ----------- | ----------- |
| `version-file` | Specify a path to search for the unity project version text file. Useful if there are multiple projects in a single repo. | false |
| `unity-version` | Specify the Unity version(s) to install. You must include the changeset! i.e `2019.4.13f1 (518737b1de84)`. ***This will override any version specified in the `version-file`!*** | false |
| `build-targets` | Specify the build targets to install for. Remaps to corresponding module. One or more of `StandaloneWindows64` `WSAPlayer` `StandaloneOSX` `iOS` `StandaloneLinux64` `Android` `Lumin` `WebGL`. | false |
| `build-targets` | Specify the build targets to install for. Remaps to corresponding module. One or more of `StandaloneWindows64` `WSAPlayer` `StandaloneOSX` `iOS` `StandaloneLinux64` `Android` `Lumin` `WebGL` `VisionOS`. | false |
| `modules` | Modules to install with the editor. This list can be different per editor version. | false |
| `architecture` | Specify the architecture to install. Either `x86_64` or `arm64`. | false |

Expand Down
2 changes: 1 addition & 1 deletion action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ inputs:
required: false
default: ''
build-targets:
description: 'Specify the build targets to install modules for. One or more of `StandaloneWindows64` `WSAPlayer` `StandaloneOSX` `iOS` `StandaloneLinux64` `Android` `Lumin` `WebGL`.'
description: 'Specify the build targets to install modules for. One or more of `StandaloneWindows64` `WSAPlayer` `StandaloneOSX` `iOS` `StandaloneLinux64` `Android` `Lumin` `WebGL` `VisionOS`.'
required: false
default: ''
modules:
Expand Down
Loading

0 comments on commit eee7a67

Please sign in to comment.