Fix license directory Linux check #96
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ghost
added
Larusso
requested changes
Jun 14, 2021
| licensePath = UnityPluginConventions.UNITY_LICENSE_DIRECTORY_MAC_OS | ||
| } | ||
| else{ | ||
| licensePath = new File("") |
There was a problem hiding this comment.
let me check the correct path on Linux
| * {@code File} to Unity license directory on macOS. | ||
| * @value "/Library/Application Support/Unity/" | ||
| */ | ||
| static File UNITY_LICENSE_DIRECTORY_LINUX = new File(".local/share/unity3d/Unity/") |
There was a problem hiding this comment.
We have to be carefull here. We should use the $HOME variable or the system property user.home to create a absolute path based on the user home.
There was a problem hiding this comment.
So it would be $HOME/shared/... ?
There was a problem hiding this comment.
no. Either "${System.env("HOME")}/.local/.... or "${System.getProperty("user.home")}/.local/...
There was a problem hiding this comment.
SO says the property way is the best
https://stackoverflow.com/a/586345/1380824
Jenkinsfile
Outdated
| @@ -14,7 +14,7 @@ | |||
| * See the License for the specific language governing permissions and | |||
| * limitations under the License. | |||
| */ | |||
| @Library('github.com/wooga/atlas-jenkins-pipeline@1.x') _ | |||
| @Library('github.com/wooga/atlas-jenkins-pipeline@1.20.x') _ | |||
Azurelol
force-pushed
the
fix/license_dir_osx_check
branch
2 times, most recently
from
d64384b
to
1747561
Compare
Larusso
approved these changes
Jun 14, 2021
Azurelol
force-pushed
the
fix/license_dir_osx_check
branch
from
1747561
to
52285c2
Compare
Azurelol
force-pushed
the
fix/license_dir_osx_check
branch
from
52285c2
to
8fa0963
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
The current check fails on the CI for Linux since there's no license directory (it was returning null)
Changes