update readme to reflect v1.1

.editorconfig

@@ -0,0 +1,21 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+max_line_length = 100
+tab_width = 2
+trim_trailing_whitespace = true
+
+[*.md]
+max_line_length = 0
+trim_trailing_whitespace = false
+
+[*.yml]
+max_line_length = 0
+
+[COMMIT_EDITMSG]
+max_line_length = 0

.github/workflows/main.yml

@@ -1,5 +1,10 @@
 name: Actions 😎
-on: [push]
+on:
+  pull_request: {}
+  push: { branches: [master] }
+
+env:
+  UNITY_LICENSE: "<?xml version=\"1.0\" encoding=\"UTF-8\"?><root>\n    <License id=\"Terms\">\n        <MachineBindings>\n            <Binding Key=\"1\" Value=\"d39b8e2f4d364b2e98b06afa0c6e08c5\"/>\n            <Binding Key=\"2\" Value=\"d39b8e2f4d364b2e98b06afa0c6e08c5\"/>\n        </MachineBindings>\n        <MachineID Value=\"Xxo1ZKbdPu/IATrc0mPBYANJFF0=\"/>\n        <SerialHash Value=\"1efd68fa935192b6090ac03c77d289a9f588c55a\"/>\n        <Features>\n            <Feature Value=\"33\"/>\n            <Feature Value=\"1\"/>\n            <Feature Value=\"12\"/>\n            <Feature Value=\"2\"/>\n            <Feature Value=\"24\"/>\n            <Feature Value=\"3\"/>\n            <Feature Value=\"36\"/>\n            <Feature Value=\"17\"/>\n            <Feature Value=\"19\"/>\n            <Feature Value=\"62\"/>\n        </Features>\n        <DeveloperData Value=\"AQAAAEY0LUg2WFMtUE00NS1SM0M4LUUyWlotWkdWOA==\"/>\n        <SerialMasked Value=\"F4-H6XS-PM45-R3C8-E2ZZ-XXXX\"/>\n        <StartDate Value=\"2018-05-02T00:00:00\"/>\n        <UpdateDate Value=\"2019-11-25T18:23:38\"/>\n        <InitialActivationDate Value=\"2018-05-02T14:21:28\"/>\n        <LicenseVersion Value=\"6.x\"/>\n        <ClientProvidedVersion Value=\"2019.2.11f1\"/>\n        <AlwaysOnline Value=\"false\"/>\n        <Entitlements>\n            <Entitlement Ns=\"unity_editor\" Tag=\"UnityPersonal\" Type=\"EDITOR\" ValidTo=\"9999-12-31T00:00:00\"/>\n        </Entitlements>\n    </License>\n<Signature xmlns=\"http://www.w3.org/2000/09/xmldsig#\"><SignedInfo><CanonicalizationMethod Algorithm=\"http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments\"/><SignatureMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#rsa-sha1\"/><Reference URI=\"#Terms\"><Transforms><Transform Algorithm=\"http://www.w3.org/2000/09/xmldsig#enveloped-signature\"/></Transforms><DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\"/><DigestValue>JHdOBFmBNq2H8BrGFzir/StLoYo=</DigestValue></Reference></SignedInfo><SignatureValue>aENLHd37a51RtP2/g7YU0Pexf5mx0/ENXYGtrPzqwZ8NQt2AsSdxGnl0CUB45/GuNXfJVDt2HWot\ncNYZB2OylVBn1WHQbKZlPmm8gEAMz0MYbr4Isb5i5buryBrZlmbEOjnRI+pEg1CBwlgMo6xdtjjE\n/d7cC293QIUO91kdzRXftYou1dNaUyuPL9ZH65vdB2pDXGRNxgUVD+GnnqZA7b5L2HXqNQclcWAK\n5Yd1BeF3VzR1iLw9G/SmH5oOhnpXSmqbL4qk7LVP2/mgXpFk5kP4X8VC3z47obNhBIGq40dwWyEe\nUYk5/nRAOkZawDT+tcu96e06gPC9Cxk5PdbRbA==</SignatureValue></Signature></root>"
 
 jobs:
   requestActivation:
@@ -13,5 +18,3 @@ jobs:
       # Activate Unity
       - name: Activate Unity
         uses: ./
-        env:
-          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}

CODE_OF_CONDUCT.md

@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+- Using welcoming and inclusive language
+- Being respectful of differing viewpoints and experiences
+- Gracefully accepting constructive criticism
+- Focusing on what is best for the community
+- Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+- The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+- Trolling, insulting/derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+- Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at webber@takken.io. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq

CONTRIBUTING.md

@@ -0,0 +1,27 @@
+# Contributing
+
+## How to Contribute
+
+#### Code of Conduct
+
+This repository has adopted the Contributor Covenant as it's
+Code of Conduct. It is expected that participants adhere to it.
+
+#### Proposing a Change
+
+If you are unsure about whether or not a change is desired,
+you can create an issue. This is useful because it creates
+the possibility for a discussion that's visible to everyone.
+
+When fixing a bug it is fine to submit a pull request right away.
+
+#### Sending a Pull Request
+
+Steps to be performed to submit a pull request:
+
+1. Fork the repository and create your branch from `master`
+2. Fill out the description, link any related issues and submit your pull request.
+
+#### License
+
+By contributing to this repository, you agree that your contributions will be licensed under its MIT license.

README.md

@@ -1,25 +1,34 @@
 # Unity - Activate
-[![Actions status](https://github.com/WebberTakken/unity-activate/workflows/Actions%20%F0%9F%98%8E/badge.svg)](https://github.com/WebberTakken/unity-activate/workflows/Actions%20%F0%9F%98%8E/badge.svg)
+[![Actions status](https://github.com/webbertakken/unity-activate/workflows/Actions%20%F0%9F%98%8E/badge.svg)](https://github.com/webbertakken/unity-activate/actions?query=branch%3Amaster+workflow%3A"Actions+😎")
 
-[Github Action](https://github.com/features/actions)
+---
-to activate Unity using credentials or a license file. Both **personal** and 
-**professional** licenses are supported.
 
-Use this action to verify whether your license file is correctly configured. If 
+GitHub Action to [activate Unity](https://github.com/marketplace/actions/unity-activate). 
-so, you will be able to run the 
+
+Part of the [Unity Actions](https://github.com/webbertakken/unity-actions) collection.
+
+---
+
+Use this action to activate Unity using credentials or a license file. Both 
+**personal** and **professional** licenses are supported.
+
+When successfully activated, you will be able to run the 
 [Test](https://github.com/webbertakken/unity-actions#test) and
 [Build](https://github.com/webbertakken/unity-actions#build)
-actions from the 
+actions.
-[Unity Actions](https://github.com/webbertakken/unity-actions) 
-collection too.
 
+### Documentation
+
+See the 
+[Unity Actions](https://github.com/webbertakken/unity-actions)
+collection repository for workflow documentation and reference implementation.
 
 ## Usage
 
 Create or edit the file called `.github/workflows/activation.yml` and add a job to it.
  
 ```yaml
-name: Acquire activation file
+name: Activate Unity
 on: [push]
 jobs:
   requestActivation:
@@ -37,7 +46,7 @@ Continue to either the personal license or professional license section below.
 
 ```yaml
 - name: Activate Unity
-  uses: webbertakken/unity-activate@v1
+  uses: webbertakken/unity-activate@v1.1
   env:
     UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
 ```
@@ -53,20 +62,21 @@ Continue to either the personal license or professional license section below.
 
 ```yaml
 - name: Activate Unity
-  uses: webbertakken/unity-activate@v1
+  uses: webbertakken/unity-activate@v1.1
   env:
     UNITY_EMAIL:    ${{ secrets.UNITY_EMAIL }}
     UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
     UNITY_SERIAL:   ${{ secrets.UNITY_SERIAL }}
 ```
 
-_**Note:** I was not able to verify these steps as i don't have a pro license. Feel free 
-to give 
-[feedback](https://github.com/webbertakken/unity-activate/issues/new) or 
-[contribute](https://github.com/webbertakken/unity-activate)._
-
 ## More actions
 
 Visit 
 [Unity Actions](https://github.com/webbertakken/unity-actions) 
 to find related actions for Unity.
+
+Feel free to contribute.
+
+## Licence 
+
+[MIT](./LICENSE)

entrypoint.sh

@@ -6,68 +6,48 @@ if [[ -n "$UNITY_LICENSE" ]]; then
   #
   # This will activate Unity, using a license file
   #
-  # Note that this is the ONLY WAY for PERSONAL LICENSES in 2019.
+  # Note that this is the ONLY WAY for PERSONAL LICENSES in 2020.
   #   * See for more details: https://gitlab.com/gableroux/unity3d-gitlab-ci-example/issues/5#note_72815478
   #
-  # The license file can be acquired in two possible ways:
+  # The license file can be acquired using `webbertakken/request-manual-activation-file` action.
-  #   * Utilize `webbertakken/unity-actions/request-manual-activation-file`
+  echo "Requesting activation (personal license)"
-  #   * Copy from your local machine (may be unstable due to different server specs)
-  #       - Windows:   C:/ProgramData/Unity/Unity_lic.ulf
-  #       - MacOS:     /Library/Application Support/Unity/Unity_lic.ulf
-  #       - Linux:     -
-  #
-  # CLI arguments reference: https://docs.unity3d.com/Manual/CommandLineArguments.html
 
   # Set the license file path
   FILE_PATH=UnityLicenseFile.ulf
 
   # Copy license file from Github variables
   echo "$UNITY_LICENSE" | tr -d '\r' > $FILE_PATH
-  echo "$UNITY_LICENSE" | tr -d '\r' > /root/.local/share/unity3d/Unity/Unity_lic.ulf
 
-  ##
+  # Activate license
-  ## Activate license
+  ACTIVATION_OUTPUT=$(xvfb-run --auto-servernum --server-args='-screen 0 640x480x24' \
-  ##
-  echo "Requesting activation"
-  xvfb-run --auto-servernum --server-args='-screen 0 640x480x24' \
     /opt/Unity/Editor/Unity \
       -batchmode \
       -nographics \
       -logFile /dev/stdout \
       -quit \
-      -manualLicenseFile $FILE_PATH
+      -manualLicenseFile $FILE_PATH)
-  # This is expected to always exit with code 1 (both success and failure).
-  # Convert to exit code 0 by echoing the current exit code.
-  echo $?
-  # Exit code is now 0
-
-  ##
-  ## Verify activated license
-  ##
-  echo "Verifying activation"
-  # Run any command that requires activation to verify
-  xvfb-run --auto-servernum --server-args='-screen 0 640x480x24' \
-    /opt/Unity/Editor/Unity \
-      -batchmode \
-      -nographics \
-      -logFile /dev/stdout \
-      -quit
 
   # Store the exit code from the verify command
   UNITY_EXIT_CODE=$?
 
-  # Display information about the result
+  # The exit code for personal activation is always 1;
-  if [ $UNITY_EXIT_CODE -eq 0 ]; then
+  # Determine whether activation was successful.
-    echo "Activation complete"
+  #
-  else
+  # Successful output should include the following:
-    echo "Unclassified error occured while trying to activate license"
+  #
-    echo "Exit code was: $UNITY_EXIT_CODE"
+  #   "LICENSE SYSTEM [2020120 18:51:20] Next license update check is after 2019-11-25T18:23:38"
-  fi
+  #
+  ACTIVATION_SUCCESSFUL=$(echo $ACTIVATION_OUTPUT | grep 'Next license update check is after' | wc -l)
 
-  # Exit with the code from the license verification step
+  # Set exit code to 0 if activation was successful
-  exit $UNITY_EXIT_CODE
+  if [[ $ACTIVATION_SUCCESSFUL -eq 1 ]]; then
+    UNITY_EXIT_CODE=0
+  fi;
 
-else
+  # Remove license file
+  rm -f $FILE_PATH
+
+elif [[ -n "$UNITY_SERIAL" && -n "$UNITY_EMAIL" && -n "$UNITY_PASSWORD" ]]; then
   #
   # PROFESSIONAL (SERIAL) LICENSE MODE
   #
@@ -75,8 +55,9 @@ else
   #
   # Note: This is the preferred way for PROFESSIONAL LICENSES.
   #
-  # TODO - Verify this using some pro license
+  echo "Requesting activation (professional license)"
-  #
+
+  # Activate license
   xvfb-run --auto-servernum --server-args='-screen 0 640x480x24' \
     /opt/Unity/Editor/Unity \
       -batchmode \
@@ -87,4 +68,34 @@ else
       -username "$UNITY_EMAIL" \
       -password "$UNITY_PASSWORD"
 
+  # Store the exit code from the verify command
+  UNITY_EXIT_CODE=$?
+
+else
+  #
+  # NO LICENSE ACTIVATION STRATEGY MATCHED
+  #
+  # This will exit since no activation strategies could be matched.
+  #
+  echo "License activation strategy could not be determined."
+  echo ""
+  echo "Visit https://github.com/webbertakken/unity-builder#usage for more"
+  echo "details on how to set up one of the possible activation strategies."
+
+  # Immediately exit as no UNITY_EXIT_CODE can be derrived.
+  exit 1;
+
+fi
+
+#
+# Display information about the result
+#
+if [ $UNITY_EXIT_CODE -eq 0 ]; then
+  # Activation was a success
+  echo "Activation complete."
+else
+  # Activation failed so exit with the code from the license verification step
+  echo "Unclassified error occured while trying to activate license."
+  echo "Exit code was: $UNITY_EXIT_CODE"
+  exit $UNITY_EXIT_CODE
 fi