Update for latest Gleam (#138)

ee0fa0b · Louis Pilfold · 2022-09-12 14:35

17 files +52 -136
Message
{commit_body(@commit)}

Files changed

modified .github/workflows/ubuntu.yml
+9 −10
@@ -116,16 +116,20 @@ jobs:
116 116 - elixir-version: 'master'
117 117 otp-version: '25'
118 118 os: 'ubuntu-20.04'
119 - gleam-version: '0.16'
119 + - gleam-version: 'nightly'
120 + otp-version: '24'
121 + - gleam-version: '0.23'
120 122 otp-version: '24'
121 rebar3-version: '3.16'
122 123 os: 'ubuntu-latest'
123 - gleam-version: '0.19.0-rc3'
124 + - gleam-version: '0.23.0-rc1'
124 125 otp-version: '24'
125 126 os: 'ubuntu-latest'
126 - gleam-version: '0.19.0-rc3'
127 + - gleam-version: '0.23.0-rc1'
127 128 otp-version: false
128 129 os: 'ubuntu-latest'
130 + - gleam-version: '0.22.0' # Version with Gleam's old archive naming convention
131 + otp-version: '24'
132 + os: 'ubuntu-latest'
129 133 steps:
130 134 - uses: actions/checkout@v2
131 135 - name: Use erlef/setup-beam
@@ -166,11 +170,6 @@ jobs:
166 170 cd test-projects/erlang_rebar3
167 171 rebar3 ct
168 172 if: ${{matrix.combo.rebar3-version}}
169 - name: Run Gleam/rebar3 project tests
170 run: |
171 cd test-projects/gleam_rebar3
172 rebar3 eunit
173 if: ${{matrix.combo.gleam-version}}
174 173 - name: Type check Gleam project (without installing Erlang/OTP)
175 174 run: |
176 175 cd test-projects/gleam_gleam
@@ -190,7 +189,7 @@ jobs:
190 189 combo:
191 190 - otp-version: '24'
192 191 elixir-version: 'v1.12'
193 gleam-version: '0.19'
192 + gleam-version: '0.23.0-rc1'
194 193 rebar3-version: 'nightly'
195 194 os: 'ubuntu-latest'
196 195 steps:
modified .github/workflows/windows.yml
+2 −7
@@ -41,7 +41,7 @@ jobs:
41 41 otp-version: '24'
42 42 rebar3-version: '3.15'
43 43 os: 'windows-latest'
44 - gleam-version: '0.16'
44 + - gleam-version: '0.23.0-rc1'
45 45 otp-version: '24'
46 46 rebar3-version: '3.16'
47 47 os: 'windows-latest'
@@ -82,11 +82,6 @@ jobs:
82 82 cd test-projects/erlang_rebar3
83 83 rebar3 ct
84 84 if: ${{matrix.combo.rebar3-version}}
85 - name: Run Gleam/rebar3 project tests
86 run: |
87 cd test-projects/gleam_rebar3
88 rebar3 eunit
89 if: ${{matrix.combo.gleam-version}}
90 85 environment_variables:
91 86 name: Environment variables
92 87 runs-on: ${{matrix.combo.os}}
@@ -96,7 +91,7 @@ jobs:
96 91 combo:
97 92 - otp-version: '24'
98 93 elixir-version: 'v1.12'
99 gleam-version: '0.19'
94 + gleam-version: '0.23.0-rc1'
100 95 rebar3-version: 'nightly'
101 96 os: 'windows-latest'
102 97 steps:
modified README.md
+2 −2
@@ -165,7 +165,7 @@ jobs:
165 165 - uses: erlef/setup-beam@v1
166 166 with:
167 167 otp-version: '24'
168 gleam-version: '0.19.0-rc3'
168 + gleam-version: '0.23.0-rc1'
169 169 - run: gleam test
170 170 ```
171 171
@@ -183,7 +183,7 @@ jobs:
183 183 - uses: erlef/setup-beam@v1
184 184 with:
185 185 otp-version: false
186 gleam-version: '0.19.0-rc3'
186 + gleam-version: '0.23.0-rc1'
187 187 - run: gleam check
188 188 ```
189 189
modified dist/install-gleam.ps1
+1 −1
@@ -4,7 +4,7 @@ $ErrorActionPreference="Stop"
4 4
5 5 Set-Location ${Env:RUNNER_TEMP}
6 6
7 $FILE_INPUT="gleam-${VSN}-windows-64bit.zip"
7 +$FILE_INPUT="gleam-${VSN}-x86_64-pc-windows-msvc.zip"
8 8 $FILE_OUTPUT="gleam.zip"
9 9 $DIR_FOR_BIN=".setup-beam/gleam"
10 10
modified dist/install-gleam.sh
+17 −2
@@ -4,11 +4,26 @@ set -eo pipefail
4 4
5 5 cd "${RUNNER_TEMP}"
6 6
7 VSN=${1}
8 FILE_INPUT=gleam-${VSN}-linux-amd64.tar.gz
7 +VSN="$1"
9 8 FILE_OUTPUT=gleam.tar.gz
10 9 DIR_FOR_BIN=.setup-beam/gleam
11 10
11 +version_gt() {
12 + test "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1"
13 +}
14 +
15 +uses_llvm_triplets() {
16 + local version="$1"
17 + test "$version" = "nightly" || version_gt "$version" "v0.22.1"
18 +}
19 +
20 +if uses_llvm_triplets "$VSN"
21 +then
22 + FILE_INPUT="gleam-${VSN}-x86_64-unknown-linux-musl.tar.gz"
23 +else
24 + FILE_INPUT="gleam-${VSN}-linux-amd64.tar.gz"
25 +fi
26 +
12 27 wget -q -O "${FILE_OUTPUT}" "https://github.com/gleam-lang/gleam/releases/download/${VSN}/${FILE_INPUT}"
13 28 mkdir -p "${DIR_FOR_BIN}/bin"
14 29 tar zxf "${FILE_OUTPUT}" -C "${DIR_FOR_BIN}/bin"
modified src/install-gleam.ps1
+1 −1

Click to load diff…

modified src/install-gleam.sh
+17 −2

Click to load diff…

modified test-projects/gleam_gleam/.github/workflows/test.yml
+1 −1

Click to load diff…

modified test-projects/gleam_gleam/manifest.toml
+2 −2

Click to load diff…

deleted test-projects/gleam_rebar3/.github/workflows/test.yml
+0 −23

Click to load diff…

deleted test-projects/gleam_rebar3/.gitignore
+0 −21

Click to load diff…

deleted test-projects/gleam_rebar3/README.md
+0 −24

Click to load diff…

deleted test-projects/gleam_rebar3/gleam.toml
+0 −3

Click to load diff…

deleted test-projects/gleam_rebar3/rebar.config
+0 −12

Click to load diff…

deleted test-projects/gleam_rebar3/src/gleam_rebar3.app.src
+0 −15

Click to load diff…

deleted test-projects/gleam_rebar3/src/gleam_rebar3.gleam
+0 −3

Click to load diff…

deleted test-projects/gleam_rebar3/test/gleam_rebar3_test.gleam
+0 −7

Click to load diff…

Parents: 4518ce1