Skip to content

Commit

Permalink
latest main merged
Browse files Browse the repository at this point in the history
  • Loading branch information
frostebite committed Dec 1, 2023
2 parents f547cb2 + bbd713b commit b14cc24
Show file tree
Hide file tree
Showing 27 changed files with 255 additions and 963 deletions.
5 changes: 3 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Steps to be performed to submit a pull request:

#### Pull Request Prerequisites

You have [Node](https://nodejs.org/) installed at v12.2.0+ and [Yarn](https://yarnpkg.com/) at v1.18.0+.
You have [Node](https://nodejs.org/) installed at v18+ and [Yarn](https://yarnpkg.com/) at v1.22.0+.

Please note that commit hooks will run automatically to perform some tasks;

Expand All @@ -36,7 +36,8 @@ Please note that commit hooks will run automatically to perform some tasks;
#### Windows users

Make sure your editor and terminal that run the tests are set to `Powershell 7` or above with
`Git's Unix tools for Windows` installed. Some tests require you to be able to run `sh` and other unix commands.
`Git's Unix tools for Windows` installed. This is because some tests require you to be able to run `sh` and other
unix commands.

#### License

Expand Down
11 changes: 11 additions & 0 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,12 @@ inputs:
required: false
default: ''
description: '[CloudRunner] GitHub owner name or organization/team name'
runAsHostUser:
required: false
default: 'false'
description:
'Whether to run as a user that matches the host system or the default root container user. Only applicable to
Linux hosts and containers. This is useful for fixing permission errors on Self-Hosted runners.'
chownFilesTo:
required: false
default: ''
Expand Down Expand Up @@ -255,6 +261,11 @@ outputs:
description: 'The generated version used for the Unity build'
androidVersionCode:
description: 'The generated versionCode used for the Android Unity build'
engineExitCode:
description:
'Returns the exit code from the build scripts. This code is 0 if the build was successful. If there was an error
during activation, the code is from the activation step. If activation is successful, the code is from the project
build step.'
branding:
icon: 'box'
color: 'gray-dark'
Expand Down
10 changes: 0 additions & 10 deletions dist/BlankProject/ProjectSettings/XRSettings.asset

This file was deleted.

709 changes: 0 additions & 709 deletions dist/default-build-script/Assembly-CSharp-Editor.csproj

This file was deleted.

10 changes: 0 additions & 10 deletions dist/default-build-script/ProjectSettings/XRSettings.asset

This file was deleted.

20 changes: 0 additions & 20 deletions dist/default-build-script/default-build-script.sln

This file was deleted.

This file was deleted.

93 changes: 36 additions & 57 deletions dist/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/index.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/platforms/mac/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ echo ""
echo "Please note that the exit code is not very descriptive."
echo "Most likely it will not help you solve the issue."
echo ""
echo "To find the reason for failure: please search for errors in the log above."
echo "To find the reason for failure: please search for errors in the log above and check for annotations in the summary view."
echo ""
fi;

Expand Down
4 changes: 0 additions & 4 deletions dist/platforms/mac/steps/activate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@ echo "Requesting activation"
# Store the exit code from the verify command
UNITY_EXIT_CODE=$?

if [ ! -f "/Library/Application Support/Unity/Unity_lic.ulf" ]; then
echo "::error ::There was an error while trying to activate the Unity license."
fi

#
# Display information about the result
#
Expand Down
Loading

0 comments on commit b14cc24

Please sign in to comment.