Merge branch 'master' into ethomson/update_description

378f678 · Jonathan Clem · 2020-01-08 18:58

16 files +172 -248

Files changed

added .github/elixir.json
+31 −0
@@ -0,0 +1,31 @@
1 +{
2 + "problemMatcher": [
3 + {
4 + "owner": "elixir",
5 + "pattern": [
6 + {
7 + "regexp": "^(\\*\\* \\(.*\\) )?((.:)?[^:]*):(\\d+)(:(\\d+))?: (.*)$",
8 + "file": 2,
9 + "line": 4,
10 + "column": 6,
11 + "message": 7
12 + }
13 + ]
14 + },
15 + {
16 + "owner": "elixir-warning",
17 + "pattern": [
18 + {
19 + "regexp": "^(warning: (.*))$",
20 + "message": 2
21 + },
22 + {
23 + "regexp": "^( )((.:)?[^:]*):(\\d+)(:(\\d+))?$",
24 + "file": 2,
25 + "line": 4,
26 + "column": 6
27 + }
28 + ]
29 + }
30 + ]
31 +}
modified .github/workflows/test.yml
+3 −0
@@ -18,6 +18,9 @@ jobs:
18 18 # Semver ranges
19 19 - otp-version: 21.x
20 20 elixir-version: <1.9.1
21 + # Branches
22 + - otp-version: 22.0
23 + elixir-version: master
21 24 steps:
22 25 - uses: actions/checkout@v1.0.0
23 26 - name: Use actions/setup-elixir
modified README.md
+14 −13
@@ -3,7 +3,8 @@
3 3 [![](https://github.com/actions/setup-elixir/workflows/Test/badge.svg)](https://github.com/actions/setup-elixir/actions)
4 4 [![](https://github.com/actions/setup-elixir/workflows/Licensed/badge.svg)](https://github.com/actions/setup-elixir/actions)
5 5
6 −This actions sets up an Elixir environment for use in Actions by:
6 +This action sets up an Elixir environment for use in a GitHub Actions
7 +workflow by:
7 8
8 9 - Installing OTP
9 10 - Installing Elixir
@@ -16,9 +17,9 @@ See [action.yml](action.yml).
16 17
17 18 **Note** The OTP release version specification is [relatively
18 19 complex](http://erlang.org/doc/system_principles/versions.html#version-scheme).
19 −For best results, the current recommendation is to use a full exact version
20 −spec from the list available from [Erlang
21 −Solutions](https://www.erlang-solutions.com/resources/download.html).
20 +For best results, we recommend specifying exact OTP and Elixir versions.
21 +However, values like `22.x` are also accepted, and we attempt to resolve them
22 +according to semantic versioning rules.
22 23
23 24 ### Basic example
24 25
@@ -29,11 +30,11 @@ jobs:
29 30 test:
30 31 runs-on: ubuntu-latest
31 32 steps:
32 − - uses: actions/checkout@v1
33 + - uses: actions/checkout@v2
33 34 - uses: actions/setup-elixir@v1
34 35 with:
35 − otp-version: 22.x
36 − elixir-version: 1.9.x
36 + otp-version: 22.2
37 + elixir-version: 1.9.4
37 38 - run: mix deps.get
38 39 - run: mix test
39 40 ```
@@ -49,10 +50,10 @@ jobs:
49 50 name: OTP ${{matrix.otp}} / Elixir ${{matrix.elixir}}
50 51 strategy:
51 52 matrix:
52 − otp: [20.x, 21.x, 22.x]
53 − elixir: [1.8.x, 1.9.x]
53 + otp: [20.3, 21.3, 22.2]
54 + elixir: [1.8.2, 1.9.4]
54 55 steps:
55 − - uses: actions/checkout@v1
56 + - uses: actions/checkout@v2
56 57 - uses: actions/setup-elixir@v1
57 58 with:
58 59 otp-version: ${{matrix.otp}}
@@ -81,11 +82,11 @@ jobs:
81 82 --health-retries 5
82 83
83 84 steps:
84 − - uses: actions/checkout@v1
85 + - uses: actions/checkout@v2
85 86 - uses: actions/setup-elixir@v1
86 87 with:
87 − otp-version: 22.x
88 − elixir-version: 1.9.x
88 + otp-version: 22.2
89 + elixir-version: 1.9.4
89 90 - run: mix deps.get
90 91 - run: mix test
91 92 ```
deleted script/build-versions
+0 −19
@@ -1,19 +0,0 @@
1 −#!/usr/bin/env bash
2 −
3 −set -eo pipefail
4 −
5 −# Find all releases that are $major.$minor(.$patch)? (no branch versions or rcs)
6 −curl -fs https://raw.githubusercontent.com/erlang/otp/master/otp_versions.table \
7 − | cut -d: -f1 \
8 − | cut -d- -f2 \
9 − | awk '{$1=$1};1' \
10 − | grep -E '^\d+\.\d+(?:\.\d+)?$' \
11 − | sed -E 's/^([0-9]+\.[0-9]+)$/\1.0/g' \
12 − > src/erlang-versions.txt
13 −
14 −# Find all releases that are $major.$minor(.$patch)? (no rcs)
15 −curl -fs https://api.github.com/repos/elixir-lang/elixir/releases \
16 − | jq -r '.[].tag_name' \
17 − | sed 's/^v//' \
18 − | grep -v '-' \
19 − > src/elixir-versions.txt
deleted src/elixir-versions.txt
+0 −24
@@ -1,24 +0,0 @@
1 −1.9.4
2 −1.9.3
3 −1.9.2
4 −1.9.1
5 −1.9.0
6 −1.8.2
7 −1.8.1
8 −1.8.0
9 −1.7.4
10 −1.7.3
11 −1.7.2
12 −1.7.1
13 −1.7.0
14 −1.6.6
15 −1.6.5
16 −1.6.4
17 −1.6.3
18 −1.6.2
19 −1.6.1
20 −1.6.0
21 −1.5.3
22 −1.5.2
23 −1.5.1
24 −1.5.0
deleted src/erlang-versions.txt
+0 −143

Click to load diff…

added src/install-elixir
+10 −0

Click to load diff…

deleted src/install-elixir-ubuntu
+0 −13

Click to load diff…

added src/install-otp
+12 −0

Click to load diff…

deleted src/install-otp-ubuntu
+0 −16

Click to load diff…

modified src/installer.js
+5 −7

Click to load diff…

modified src/setup-elixir.js
+97 −13

Click to load diff…

Parents: ec8659d 06ccede