Merge branch 'develop' into feature/yamato-trigger-format-project-pack

Author: fernando-cortez

.gitattributes

@@ -18,7 +18,6 @@
 *.skp filter=lfs diff=lfs merge=lfs -text
 *.stl filter=lfs diff=lfs merge=lfs -text
 *.ztl filter=lfs diff=lfs merge=lfs -text
-
 # Audio
 *.aif filter=lfs diff=lfs merge=lfs -text
 *.aiff filter=lfs diff=lfs merge=lfs -text
@@ -29,11 +28,9 @@
 *.s3m filter=lfs diff=lfs merge=lfs -text
 *.wav filter=lfs diff=lfs merge=lfs -text
 *.xm filter=lfs diff=lfs merge=lfs -text
-
 # Fonts
 *.otf filter=lfs diff=lfs merge=lfs -text
 *.ttf filter=lfs diff=lfs merge=lfs -text
-
 # Images
 *.bmp filter=lfs diff=lfs merge=lfs -text
 *.exr filter=lfs diff=lfs merge=lfs -text
@@ -48,9 +45,9 @@
 *.[tT][gG][aA] filter=lfs diff=lfs merge=lfs -text
 *.tif filter=lfs diff=lfs merge=lfs -text
 *.tiff filter=lfs diff=lfs merge=lfs -text
-
 # Unity
 *.unity filter=lfs diff=lfs merge=lfs text
 *.prefab binary
 *.asset filter=lfs diff=lfs merge=lfs -text
 *.anim filter=lfs diff=lfs merge=lfs -text
+*.tga filter=lfs diff=lfs merge=lfs -text

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,39 +1,18 @@
-<!---
-    Thank you for contributing to Unity.
-    To help us process this pull request we recommend that you add the following information:
-     - Summary and list of changes in the pull request,
-     - Issue(s) related to the changes made such as GitHub or Jira,
-     - Manual testing scenarios if available
-    Fields marked with (*) are required. Please don't remove the template.
--->
-### Description (*)
+### Description
 <!---
     Please provide a description of the changes proposed in the pull request.
-    Letting us know what has changed and why it needed changing will help us validate this pull request.
+    Make sure your commit messages have meaningful information.
+    To help us link commits and PRs to JIRA work items, please include the JIRA ticket ID in the PR title or at least of your commit messages.
 -->
-### Related Pull Requests
-<!-- related pull request placeholder -->
-### Issue Number(s) (*)
+
+### Issue Number(s)
 <!---
     Provide a list of fixed issues from Jira (GOMPS-ticketnumber) or GitHub (#issuenumber).
     This helps us understand the reasoning behind this change, what it fixes, feature being added, etc.
 -->
-Fixes issue(s):
-### Manual testing scenarios
-<!---
-    Please provide a set of unambiguous steps to test the proposed code change.
-    If an error is output to either the player or editor log file, please attach.
-    Giving us manual testing scenarios will help with the processing and validation process.
--->
-1. ...
-2. ...
-### Questions or comments
-<!---
-	If relevant, here you can ask questions or provide comments on your pull request for the reviewer
-	For example if you need assistance with writing tests or would like some feedback on one of your development ideas or for the reviewer to focus on a particular area of the code.
--->
+
 ### Contribution checklist
  - [ ] Pull request has a meaningful description of its purpose
  - [ ] All commits are accompanied by meaningful commit messages
- - [ ] All new or changed code is covered with unit/integration tests (if applicable)
- - [ ] All automated tests passed successfully (all builds are green)
+ - [ ] JIRA ticket ID is in the PR title or at least one commit message
+ - [ ] Include the ticket ID number within the body message of the PR to create a hyperlink

.github/workflows/leak_detect.yml

@@ -0,0 +1,40 @@
+name: Detect Project ID leak
+
+# Controls when the workflow will run
+on:
+  # Triggers the workflow on push or pull request events but only for the main branch
+  push:
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  check:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      - name: Checkout github repo (+ download lfs dependencies)
+        # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+        uses: actions/checkout@v2
+        with:
+          lfs: true
+      - name: Checkout LFS objects # needs to be done as a second step, lfs:true above just sets references, but doesn't actually dereference them...
+        run: git lfs checkout
+      # Find in project settings if there's any value in between "cloudProjectId: " and end of line. This exits 1 and fails the step if there's text there.
+      - name: Run a one-line script
+        run: python3 -c "import re; import sys;content=open('ProjectSettings/ProjectSettings.asset').read();res = re.search(r'.*cloudProjectId:.*\w+\s*\n', content)!=None;status = 1 if res else 0; print('status '+str(status)); sys.exit(res)"
+      - name: Post to slack on failure
+        if: ${{ failure() }}
+        uses: slackapi/[email protected]
+        with:
+            # Slack channel id, channel name, or user id to post message.
+            # See also: https://api.slack.com/methods/chat.postMessage#channels
+            channel-id: 'G01H7JP4AP2' # private channel
+            # For posting a simple plain text message
+            slack-message: "@here Project ID LEAK DETECTED: ${{ job.status }}\n${{ github.event.pull_request.html_url || github.event.head_commit.url }}"
+        env:
+            SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }} # can be found in https://api.slack.com/apps/