Fix merge conflicts

README.md

@@ -75,7 +75,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
-        python-version: [3.5.4, 3.6.6, 3.7.4, 3.8.1]
+        python-version: [3.5, 3.6, 3.7.4, 3.8]
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-python@v1
@@ -91,10 +91,10 @@ Check out our detailed guide on using [Python with GitHub Actions](https://help.
 
 # Available versions of Python
 
-`setup-python` is able to configure python from two sources
+`setup-python` is able to configure Python from two sources:
 
 - Preinstalled versions of Python in the tools cache on GitHub-hosted runners
-    - For detailed information regarding the available versions of Python that are installed see [Software installed on GitHub-hosted runners](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/software-installed-on-github-hosted-runners)
+    - For detailed information regarding the available versions of Python that are installed see [Software installed on GitHub-hosted runners](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/software-installed-on-github-hosted-runners).
     - For every minor version of Python, expect only the latest patch to be preinstalled. See [Semantic Versioning](https://semver.org/) for more information
     - If `3.8.1` is installed for example, and `3.8.2` is released, expect `3.8.1` to be removed and replaced by `3.8.2` in the tools cache
     - If the exact patch version doesn't matter to you, specifying just the major and minor version will get you the latest preinstalled patch version. In this case, for example, the version spec 3.8 will use the 3.8.2 found in the cache
@@ -118,6 +118,7 @@ GitHub virtual environments are setup in [actions/virtual-environments](https://
 
 # Using `setup-python` with a self hosted runner
 
+<<<<<<< HEAD
 If you would like to use `setup-python` and a self-hosted runner, there isn't much that you need to do. When `setup-python` is run for the first time with a version of Python that it doesn't have, it will download the appropriate version, and setup the tools cache on your machine. Any subsequent runs will use the python versions that were previously downloaded.
 
 A few things to look out for when `setup-python` is first setting up the tools cache
@@ -125,6 +126,31 @@ A few things to look out for when `setup-python` is first setting up the tools c
 - On Windows, you need `7zip` installed and added to your `PATH` so that files can be extracted properly during setup
 - MSI installers are used when setting up Python on Windows. A word of caution as MSI installers update registry settings
 - The 3.8 MSI installer for Windows will not let you install another 3.8 version of Python. If `setup-python` fails for a 3.8 version of Python, make sure any previously installed versions are removed by going to "Apps and Features" in the Windows settings and uninstalling any
+=======
+If you would like to use `setup-python` and a self-hosted runner, you have two options
+  - Setup a tools cache locally and download all the versions of Python & PyPy that you would like once
+      - Takes a little bit of time to initially setup
+      - This will be the most stable and fastest option long-term as it will require no extra downloads every-time there is a run
+  - Download and setup a version of python every-time
+      - Requires no extra setup (good if you want to quickly get up and running, discouraged for long term use)
+      - `setup-python` will take a little longer to run
+      - Note: when downloading versions of Python for Windows, an MSI installer is used which can modify some registry settings
+
+### Setting up a local tools cache
+
+- Create an global environment variable called `AGENT_TOOLSDIRECTORY` that will point to the root directory of where you want the tools installed. The env variable is preferably global as it must be set in the shell that will install the tools cache, along with the shell that the runner will be using.
+    - This env variable is used internally by the runner to set the `RUNNER_TOOL_CACHE` env variable
+    - Example for Administrator Powershell: `[System.Environment]::SetEnvironmentVariable("AGENT_TOOLSDIRECTORY", "C:\hostedtoolcache\windows", [System.EnvironmentVariableTarget]::Machine)` (restart the shell afterwards)
+-  Download the appropriate NPM packages from the [GitHub Actions NPM registry](https://github.com/orgs/actions/packages)
+    - Make sure to have `npm` installed, and then [configure npm for use with GitHub packages](https://help.github.com/en/packages/using-github-packages-with-your-projects-ecosystem/configuring-npm-for-use-with-github-packages#authenticating-to-github-package-registry)
+    - Create an empty npm project for easier installation (`npm init`) in the tools cache directory. You can delete `package.json`, `package.lock.json` and `node_modules` after all tools get installed
+    - Before downloading a specific package, create an empty folder for the version of Python/PyPY that is being installed. If downloading Python 3.6.8 for example, create `C:\hostedtoolcache\windows\Python\3.6.8`
+    - Once configured, download a specific package by calling `npm install`. Note (if downloading a PyPy package on Windows, you will need 7zip installed along with `7z.exe` added to your PATH)
+- Each NPM package has multiple versions that determine the version of Python or PyPy that should be installed. 
+    - `npm install @actions/toolcache-python-windows-x64@3.7.61579791175` for example installs Python 3.7.6 while `npm install @actions/toolcache-python-windows-x64@3.6.81579791177` installs Python 3.6.8
+    - You can browse and find all available versions of a package by searching the GitHub Actions NPM registry
+![image](https://user-images.githubusercontent.com/16109154/76194005-87aeb400-61e5-11ea-9b21-ef9111247f84.png)
+>>>>>>> 55306a552e9a92a3bac6eac208bf18cedcea1fd9
 
 # Using Python without `setup-python`
 
@@ -132,12 +158,18 @@ A few things to look out for when `setup-python` is first setting up the tools c
 
 # Need to open an issue?
 
-Python versions that we compile and setup can be found in the [actions/python-versions](https://github.com/actions/python-versions) repository. You can see the build scripts, configurations, and everything that is used. You should open an issue in the `python-versions` repository if:
+Python versions available for `setup-python` can be found in the [actions/python-versions](https://github.com/actions/python-versions) repository. You can see the build scripts, configurations, and everything that is used. You should open an issue in the `python-versions` repository if:
   - something might be compiled incorrectly
   - certain modules might be missing
   - there is a version of Python that you would like that is currently not available
 
+<<<<<<< HEAD
 Any remaining issues can be filed in this repository
+=======
+If you suspect something might be wrong with the tools cache or how Python gets installed on GitHub hosted runners, please open an issue in [actions/virtual-environments](https://github.com/actions/virtual-environments).
+
+Any remaining issues can be filed in this repository.
+>>>>>>> 55306a552e9a92a3bac6eac208bf18cedcea1fd9
 
 # License