Merge branch 'master' into ethomson/update_description

README.md

@@ -3,7 +3,8 @@
 [![](https://github.com/actions/setup-elixir/workflows/Test/badge.svg)](https://github.com/actions/setup-elixir/actions)
 [![](https://github.com/actions/setup-elixir/workflows/Licensed/badge.svg)](https://github.com/actions/setup-elixir/actions)
 
-This actions sets up an Elixir environment for use in Actions by:
+This action sets up an Elixir environment for use in a GitHub Actions
+workflow by:
 
 - Installing OTP
 - Installing Elixir
@@ -16,9 +17,9 @@ See [action.yml](action.yml).
 
 **Note** The OTP release version specification is [relatively
 complex](http://erlang.org/doc/system_principles/versions.html#version-scheme).
-For best results, the current recommendation is to use a full exact version
-spec from the list available from [Erlang
-Solutions](https://www.erlang-solutions.com/resources/download.html).
+For best results, we recommend specifying exact OTP and Elixir versions.
+However, values like `22.x` are also accepted, and we attempt to resolve them
+according to semantic versioning rules.
 
 ### Basic example
 
@@ -29,11 +30,11 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - uses: actions/setup-elixir@v1
         with:
-          otp-version: 22.x
-          elixir-version: 1.9.x
+          otp-version: 22.2
+          elixir-version: 1.9.4
       - run: mix deps.get
       - run: mix test
 ```
@@ -49,10 +50,10 @@ jobs:
     name: OTP ${{matrix.otp}} / Elixir ${{matrix.elixir}}
     strategy:
       matrix:
-        otp: [20.x, 21.x, 22.x]
-        elixir: [1.8.x, 1.9.x]
+        otp: [20.3, 21.3, 22.2]
+        elixir: [1.8.2, 1.9.4]
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - uses: actions/setup-elixir@v1
         with:
           otp-version: ${{matrix.otp}}
@@ -81,11 +82,11 @@ jobs:
           --health-retries 5
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - uses: actions/setup-elixir@v1
         with:
-          otp-version: 22.x
-          elixir-version: 1.9.x
+          otp-version: 22.2
+          elixir-version: 1.9.4
       - run: mix deps.get
       - run: mix test
 ```