Fix setting INSTALL_DIR_FOR_OTP (#141)

* Prevent "future" errors when choosing incompatible Elixir v. OTP versions

* Fix tests as per GitHub Actions' output

* Make test elixir `master` strict

It has no -otp- in the name

.github/workflows/ubuntu.yml

@@ -21,7 +21,25 @@ jobs:
       fail-fast: false
       matrix:
         combo:
-          - otp-version: '25.0-rc1'
+          - otp-version: '25'
+            elixir-version: '1'
+            rebar3-version: '3'
+            os: 'ubuntu-22.04'
+          - otp-version: '24'
+            elixir-version: '1'
+            rebar3-version: '3'
+            os: 'ubuntu-22.04'
+          - otp-version: '25.0'
+            elixir-version: 'v1.13.4-otp-25'
+            rebar3-version: '3.18.0'
+            os: 'ubuntu-latest'
+            version-type: 'strict'
+          - otp-version: '25.0'
+            elixir-version: 'v1.13.4'
+            rebar3-version: '3.18.0'
+            os: 'ubuntu-latest'
+            version-type: 'strict'
+          - otp-version: '25'
             rebar3-version: 'nightly'
             os: 'ubuntu-latest'
           - otp-version: '24'
@@ -65,6 +83,10 @@ jobs:
             otp-version: '23'
             rebar3-version: '3.14'
             os: 'ubuntu-18.04'
+          - elixir-version: 'v1.13.4'
+            otp-version: '25.0.2'
+            rebar3-version: '3.19'
+            os: 'ubuntu-18.04'
           - elixir-version: 'v1.10'
             otp-version: '23'
             rebar3-version: '3.14'
@@ -73,6 +95,10 @@ jobs:
             otp-version: '24'
             rebar3-version: '3.15'
             os: 'ubuntu-20.04'
+          - elixir-version: 'v1.13.4'
+            otp-version: '25.0.2'
+            rebar3-version: '3.19'
+            os: 'ubuntu-20.04'
           - elixir-version: 'v1.11.0'
             otp-version: '22.3.4.2'
             os: 'ubuntu-20.04'
@@ -87,16 +113,24 @@ jobs:
           - elixir-version: 'master'
             otp-version: '23.1'
             os:  'ubuntu-20.04'
-          - gleam-version: '0.16'
+          - elixir-version: 'master'
+            otp-version: '25'
+            os:  'ubuntu-20.04'
+            version-type: 'strict'
+          - gleam-version: 'nightly'
             otp-version: '24'
-            rebar3-version: '3.16'
-            os: 'ubuntu-latest'
-          - gleam-version: '0.19.0-rc3'
+          - gleam-version: '0.23'
             otp-version: '24'
             os: 'ubuntu-latest'
-          - gleam-version: '0.19.0-rc3'
+          - gleam-version: '0.23.0-rc1'
+            otp-version: '24'
+            os: 'ubuntu-latest'
+          - gleam-version: '0.23.0-rc1'
             otp-version: false
             os: 'ubuntu-latest'
+          - gleam-version: '0.22.0' # Version with Gleam's old archive naming convention
+            otp-version: '24'
+            os: 'ubuntu-latest'
     steps:
       - uses: actions/checkout@v2
       - name: Use erlef/setup-beam
@@ -137,11 +171,6 @@ jobs:
           cd test-projects/erlang_rebar3
           rebar3 ct
         if: ${{matrix.combo.rebar3-version}}
-      - name: Run Gleam/rebar3 project tests
-        run: |
-          cd test-projects/gleam_rebar3
-          rebar3 eunit
-        if: ${{matrix.combo.gleam-version}}
       - name: Type check Gleam project (without installing Erlang/OTP)
         run: |
           cd test-projects/gleam_gleam
@@ -161,7 +190,7 @@ jobs:
         combo:
           - otp-version: '24'
             elixir-version: 'v1.12'
-            gleam-version: '0.19'
+            gleam-version: '0.23.0-rc1'
             rebar3-version: 'nightly'
             os: 'ubuntu-latest'
     steps:

.github/workflows/windows.yml

@@ -21,7 +21,7 @@ jobs:
       fail-fast: false
       matrix:
         combo:
-          - otp-version: '25.0-rc1'
+          - otp-version: '25'
             rebar3-version: 'nightly'
             os: 'windows-latest'
           - otp-version: '24.0.2'
@@ -41,7 +41,7 @@ jobs:
             otp-version: '24'
             rebar3-version: '3.15'
             os: 'windows-latest'
-          - gleam-version: '0.16'
+          - gleam-version: '0.23.0-rc1'
             otp-version: '24'
             rebar3-version: '3.16'
             os: 'windows-latest'
@@ -82,11 +82,6 @@ jobs:
           cd test-projects/erlang_rebar3
           rebar3 ct
         if: ${{matrix.combo.rebar3-version}}
-      - name: Run Gleam/rebar3 project tests
-        run: |
-          cd test-projects/gleam_rebar3
-          rebar3 eunit
-        if: ${{matrix.combo.gleam-version}}
   environment_variables:
     name: Environment variables
     runs-on: ${{matrix.combo.os}}
@@ -96,7 +91,7 @@ jobs:
         combo:
           - otp-version: '24'
             elixir-version: 'v1.12'
-            gleam-version: '0.19'
+            gleam-version: '0.23.0-rc1'
             rebar3-version: 'nightly'
             os: 'windows-latest'
     steps:

CONTRIBUTING.md

@@ -25,6 +25,7 @@ Here are a few things you can do that will increase the likelihood of your pull
 - Write tests.
 - Keep your change as focused as possible. If there are multiple changes you would like to make that are not dependent upon each other, consider submitting them as separate pull requests.
 - Write a [good commit message](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
+- Execute `npm run build-dist` and fix any issues arising from that
 
 ## Resources
 

README.md

@@ -18,7 +18,7 @@ workflow by:
 - optionally, installing [`hex`](https://hex.pm/)
 - optionally, having
   [problem matchers](https://github.com/actions/toolkit/blob/main/docs/problem-matchers.md) show
-  warnings and errors on pull requestsotp-version: false)
+  warnings and errors on pull requests
 
 **Note**: currently, this action only supports Actions' `ubuntu-` and `windows-` runtimes.
 
@@ -49,10 +49,11 @@ and Erlang/OTP.
 
 | Operating system | Erlang/OTP | Status
 |-                 |-           |-
-| ubuntu-18.04     | 17 - 24    | ✅
-| ubuntu-20.04     | 20 - 24    | ✅
-| windows-2019     | 21* - 24   | ✅
-| windows-2022     | 21* - 24   | ✅
+| ubuntu-18.04     | 17 - 25    | ✅
+| ubuntu-20.04     | 20 - 25    | ✅
+| ubuntu-22.04     | 24.2 - 25  | ✅
+| windows-2019     | 21* - 25   | ✅
+| windows-2022     | 21* - 25   | ✅
 
 **Note** *: prior to 23, Windows builds are only available for minor versions, e.g. 21.0, 21.3, 22.0, etc.
 
@@ -65,6 +66,7 @@ uses that to download assets:
 |-         |-
 | ubuntu18 | ubuntu-18.04
 | ubuntu20 | ubuntu-20.04
+| ubuntu22 | ubuntu-22.04
 | win19    | windows-2019
 | win22    | windows-2022
 
@@ -163,7 +165,7 @@ jobs:
       - uses: erlef/setup-beam@v1
         with:
           otp-version: '24'
-          gleam-version: '0.19.0-rc3'
+          gleam-version: '0.23.0-rc1'
       - run: gleam test
 ```
 
@@ -181,7 +183,7 @@ jobs:
       - uses: erlef/setup-beam@v1
         with:
           otp-version: false
-          gleam-version: '0.19.0-rc3'
+          gleam-version: '0.23.0-rc1'
       - run: gleam check
 ```
 
@@ -192,9 +194,9 @@ jobs:
 Base installation folders (useful for e.g. fetching headers for NIFs) are available in the following
 environment variables:
 
-- `INSTALL_DIR_FOR_ELIXIR`: base folder for Erlang/OTP
-- `INSTALL_DIR_FOR_GLEAM`: base folder for Elixir
-- `INSTALL_DIR_FOR_OTP`: base folder for Gleam
+- `INSTALL_DIR_FOR_OTP`: base folder for Erlang/OTP
+- `INSTALL_DIR_FOR_ELIXIR`: base folder for Elixir
+- `INSTALL_DIR_FOR_GLEAM`: base folder for Gleam
 - `INSTALL_DIR_FOR_REBAR3`: base folder for `rebar3`
 
 ## Elixir Problem Matchers

__tests__/setup-beam.test.js

@@ -171,8 +171,8 @@ async function testElixirVersions() {
   let otpVersion
 
   spec = '1.1.x'
-  otpVersion = 'OTP-23'
-  expected = 'v1.1.1'
+  otpVersion = 'OTP-17'
+  expected = 'v1.1.1-otp-17'
   got = await setupBeam.getElixirVersion(spec, otpVersion)
   assert.deepStrictEqual(got, expected)
 

dist/install-gleam.ps1

@@ -4,7 +4,7 @@ $ErrorActionPreference="Stop"
 
 Set-Location ${Env:RUNNER_TEMP}
 
-$FILE_INPUT="gleam-${VSN}-windows-64bit.zip"
+$FILE_INPUT="gleam-${VSN}-x86_64-pc-windows-msvc.zip"
 $FILE_OUTPUT="gleam.zip"
 $DIR_FOR_BIN=".setup-beam/gleam"
 

dist/install-gleam.sh

@@ -4,11 +4,26 @@ set -eo pipefail
 
 cd "${RUNNER_TEMP}"
 
-VSN=${1}
-FILE_INPUT=gleam-${VSN}-linux-amd64.tar.gz
+VSN="$1"
 FILE_OUTPUT=gleam.tar.gz
 DIR_FOR_BIN=.setup-beam/gleam
 
+version_gt() {
+  test "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1"
+}
+
+uses_llvm_triplets() {
+  local version="$1"
+  test "$version" = "nightly" || version_gt "$version" "v0.22.1"
+}
+
+if uses_llvm_triplets "$VSN"
+then
+  FILE_INPUT="gleam-${VSN}-x86_64-unknown-linux-musl.tar.gz"
+else
+  FILE_INPUT="gleam-${VSN}-linux-amd64.tar.gz"
+fi
+
 wget -q -O "${FILE_OUTPUT}" "https://github.com/gleam-lang/gleam/releases/download/${VSN}/${FILE_INPUT}"
 mkdir -p "${DIR_FOR_BIN}/bin"
 tar zxf "${FILE_OUTPUT}" -C "${DIR_FOR_BIN}/bin"

dist/install-otp.ps1

@@ -5,18 +5,13 @@ $ErrorActionPreference="Stop"
 Set-Location ${Env:RUNNER_TEMP}
 
 $FILE_OUTPUT="otp.exe"
-$DIR_FOR_BIN=".setup-beam/otp"
+$ERL_ROOT = "${Env:RUNNER_TEMP}\.setup-beam\otp"
 
 $ProgressPreference="SilentlyContinue"
 Invoke-WebRequest "https://github.com/erlang/otp/releases/download/OTP-${VSN}/otp_win64_${VSN}.exe" -OutFile "${FILE_OUTPUT}"
 $ProgressPreference="Continue"
-New-Item "${DIR_FOR_BIN}" -ItemType Directory | Out-Null
-Move-Item "${FILE_OUTPUT}" "${DIR_FOR_BIN}"
-Start-Process "./${DIR_FOR_BIN}/${FILE_OUTPUT}" /S -Wait
-$ErlExec = Get-ChildItem -Path "C:/Program Files/" -Recurse -Depth 2 -Filter 'erl.exe' -Name | ForEach-Object { Write-Output "C:/Program Files/$_" }
-$ErlPath = Split-Path -Path "${ErlExec}"
-Write-Output "${ErlPath}" | Out-File -FilePath otp_path.txt -Encoding utf8 -NoNewline
+Start-Process "${FILE_OUTPUT}" "/S /D=${ERL_ROOT}" -Wait
 Write-Output "Installed Erlang/OTP version follows"
-& "${ErlPath}/erl.exe" "+V" | Write-Output
+& "${ERL_ROOT}/bin/erl.exe" "+V" | Write-Output
 
-"INSTALL_DIR_FOR_OTP="+(Get-Item ${ErlPath}).parent.FullName | Out-File -FilePath ${Env:GITHUB_ENV} -Encoding utf8 -Append
+"INSTALL_DIR_FOR_OTP=${ERL_ROOT}" | Out-File -FilePath ${Env:GITHUB_ENV} -Encoding utf8 -Append

dist/licenses.txt

@@ -1,122 +0,0 @@
-@actions/core
-MIT
-The MIT License (MIT)
-
-Copyright 2019 GitHub
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-@actions/exec
-MIT
-The MIT License (MIT)
-
-Copyright 2019 GitHub
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-@actions/http-client
-MIT
-Actions Http Client for Node.js
-
-Copyright (c) GitHub, Inc.
-
-All rights reserved.
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
-associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-@actions/io
-MIT
-The MIT License (MIT)
-
-Copyright 2019 GitHub
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-lru-cache
-ISC
-The ISC License
-
-Copyright (c) 2010-2022 Isaac Z. Schlueter and Contributors
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-semver
-ISC
-The ISC License
-
-Copyright (c) Isaac Z. Schlueter and Contributors
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
-tunnel
-MIT
-The MIT License (MIT)
-
-Copyright (c) 2012 Koichi Kobayashi
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

package.json

@@ -3,14 +3,15 @@
   "license": "MIT",
   "private": true,
   "scripts": {
-    "build": "ncc build src/setup-beam.js --no-cache --license licenses.txt",
+    "build": "ncc build src/setup-beam.js --no-cache",
     "format": "prettier src/**/*.js --write && prettier __tests__/**/*.js --write",
     "jslint": "eslint src/**/*.js && eslint __tests__/**/*.js",
     "licenses": "yarn licenses generate-disclaimer > 3RD_PARTY_LICENSES",
     "markdownlint": "markdownlint *.md",
     "shellcheck": "shellcheck src/install-*.sh .github/workflows/*.sh",
     "test": "node __tests__/setup-beam.test.js && node ./__tests__/problem-matchers.test.js",
-    "yamllint": "yamllint .github/workflows/**.yml && yamllint .*.yml && yamllint *.yml"
+    "yamllint": "yamllint .github/workflows/**.yml && yamllint .*.yml && yamllint *.yml",
+    "build-dist": "npm install && npm run build && npm run format && npm run markdownlint && npm run shellcheck && npm run yamllint && npm run jslint"
   },
   "husky": {
     "hooks": {
@@ -18,13 +19,13 @@
     }
   },
   "dependencies": {
-    "@actions/core": "1.6.0",
+    "@actions/core": "1.9.1",
     "@actions/exec": "1.1.1",
     "semver": "7.3.6"
   },
   "devDependencies": {
     "@vercel/ncc": "0.33.4",
-    "eslint": "8.13.0",
+    "eslint": "8.14.0",
     "eslint-config-airbnb": "19.0.4",
     "eslint-plugin-import": "2.26.0",
     "eslint-plugin-jsx-a11y": "6.5.1",
@@ -33,7 +34,7 @@
     "markdownlint": "0.25.1",
     "prettier": "2.6.2",
     "shellcheck": "1.1.0",
-    "yaml-lint": "1.2.4",
+    "yaml-lint": "1.3.0",
     "yarn": "1.22.18"
   },
   "engines": {

src/install-gleam.ps1

@@ -4,7 +4,7 @@ $ErrorActionPreference="Stop"
 
 Set-Location ${Env:RUNNER_TEMP}
 
-$FILE_INPUT="gleam-${VSN}-windows-64bit.zip"
+$FILE_INPUT="gleam-${VSN}-x86_64-pc-windows-msvc.zip"
 $FILE_OUTPUT="gleam.zip"
 $DIR_FOR_BIN=".setup-beam/gleam"
 

src/install-gleam.sh

@@ -4,11 +4,26 @@ set -eo pipefail
 
 cd "${RUNNER_TEMP}"
 
-VSN=${1}
-FILE_INPUT=gleam-${VSN}-linux-amd64.tar.gz
+VSN="$1"
 FILE_OUTPUT=gleam.tar.gz
 DIR_FOR_BIN=.setup-beam/gleam
 
+version_gt() {
+  test "$(printf '%s\n' "$@" | sort -V | head -n 1)" != "$1"
+}
+
+uses_llvm_triplets() {
+  local version="$1"
+  test "$version" = "nightly" || version_gt "$version" "v0.22.1"
+}
+
+if uses_llvm_triplets "$VSN"
+then
+  FILE_INPUT="gleam-${VSN}-x86_64-unknown-linux-musl.tar.gz"
+else
+  FILE_INPUT="gleam-${VSN}-linux-amd64.tar.gz"
+fi
+
 wget -q -O "${FILE_OUTPUT}" "https://github.com/gleam-lang/gleam/releases/download/${VSN}/${FILE_INPUT}"
 mkdir -p "${DIR_FOR_BIN}/bin"
 tar zxf "${FILE_OUTPUT}" -C "${DIR_FOR_BIN}/bin"

src/install-otp.ps1

@@ -5,18 +5,13 @@ $ErrorActionPreference="Stop"
 Set-Location ${Env:RUNNER_TEMP}
 
 $FILE_OUTPUT="otp.exe"
-$DIR_FOR_BIN=".setup-beam/otp"
+$ERL_ROOT = "${Env:RUNNER_TEMP}\.setup-beam\otp"
 
 $ProgressPreference="SilentlyContinue"
 Invoke-WebRequest "https://github.com/erlang/otp/releases/download/OTP-${VSN}/otp_win64_${VSN}.exe" -OutFile "${FILE_OUTPUT}"
 $ProgressPreference="Continue"
-New-Item "${DIR_FOR_BIN}" -ItemType Directory | Out-Null
-Move-Item "${FILE_OUTPUT}" "${DIR_FOR_BIN}"
-Start-Process "./${DIR_FOR_BIN}/${FILE_OUTPUT}" /S -Wait
-$ErlExec = Get-ChildItem -Path "C:/Program Files/" -Recurse -Depth 2 -Filter 'erl.exe' -Name | ForEach-Object { Write-Output "C:/Program Files/$_" }
-$ErlPath = Split-Path -Path "${ErlExec}"
-Write-Output "${ErlPath}" | Out-File -FilePath otp_path.txt -Encoding utf8 -NoNewline
+Start-Process "${FILE_OUTPUT}" "/S /D=${ERL_ROOT}" -Wait
 Write-Output "Installed Erlang/OTP version follows"
-& "${ErlPath}/erl.exe" "+V" | Write-Output
+& "${ERL_ROOT}/bin/erl.exe" "+V" | Write-Output
 
-"INSTALL_DIR_FOR_OTP="+(Get-Item ${ErlPath}).parent.FullName | Out-File -FilePath ${Env:GITHUB_ENV} -Encoding utf8 -Append
+"INSTALL_DIR_FOR_OTP=${ERL_ROOT}" | Out-File -FilePath ${Env:GITHUB_ENV} -Encoding utf8 -Append

src/setup-beam.js

@@ -3,7 +3,6 @@ const { exec } = require('@actions/exec')
 const path = require('path')
 const semver = require('semver')
 const https = require('https')
-const fs = require('fs')
 const installer = require('./installer')
 
 main().catch((err) => {
@@ -48,15 +47,7 @@ async function installOTP(otpSpec, osVersion) {
   )
   await installer.installOTP(osVersion, otpVersion)
   core.setOutput('otp-version', otpVersion)
-  if (process.platform === 'linux') {
   core.addPath(`${process.env.RUNNER_TEMP}/.setup-beam/otp/bin`)
-  } else if (process.platform === 'win32') {
-    const otpPath = fs.readFileSync(`${process.env.RUNNER_TEMP}/otp_path.txt`, {
-      encoding: 'utf8',
-      flag: 'r',
-    })
-    core.addPath(otpPath)
-  }
   console.log('##[endgroup]')
 
   return otpVersion
@@ -139,12 +130,12 @@ async function maybeInstallRebar3(rebar3Spec) {
 
 async function getOTPVersion(otpSpec0, osVersion) {
   const otpVersions = await getOTPVersions(osVersion)
-  const otpSpec = otpSpec0.match(/^(OTP-)?([^ ]+)/)
+  const otpSpec = otpSpec0.match(/^(OTP-|maint-)?([^ ]+)/)
   let otpVersion
-  if (otpSpec[1]) {
+  if (otpSpec[1] && !isStrictVersion()) {
     throw new Error(
       `Requested Erlang/OTP version (${otpSpec0}) ` +
-        "should not contain 'OTP-'",
+        "should not contain 'OTP-, or maint-'",
     )
   }
   if (otpSpec) {
@@ -169,7 +160,7 @@ async function getElixirVersion(exSpec0, otpVersion) {
 
   const exSpec = exSpec0.match(/^v?(.+)(-otp-.+)/) || exSpec0.match(/^v?(.+)/)
   let elixirVersion
-  if (exSpec[2]) {
+  if (exSpec[2] && !isStrictVersion()) {
     throw new Error(
       `Requested Elixir / Erlang/OTP version (${exSpec0} / ${otpVersion}) ` +
         "should not contain '-otp-...'",
@@ -197,9 +188,11 @@ async function getElixirVersion(exSpec0, otpVersion) {
         `Using Elixir ${elixirVersion} (built for OTP ${otpVersionMajor})`,
       )
     } else {
-      // ... and it's not available: fallback to the 'generic' version (v1.4.5 only).
-      elixirVersionWithOTP = elixirVersion
-      core.info(`Using Elixir ${elixirVersion}`)
+      // ... and it's not available: exit with exception
+      throw new Error(
+        `Requested Elixir / Erlang/OTP version (${exSpec0} / ${otpVersion}) not ` +
+          'found in version list (did you check Compatibility between Elixir and Erlang/OTP?)',
+      )
     }
   } else {
     throw new Error(
@@ -258,7 +251,7 @@ async function getOTPVersions(osVersion) {
       .trim()
       .split('\n')
       .forEach((line) => {
-        const otpMatch = line.match(/^(OTP-)?([^ ]+)/)
+        const otpMatch = line.match(/^(OTP-|maint-)?([^ ]+)/)
         const otpVersion = otpMatch[2]
         otpVersions.set(otpVersion, otpMatch[0]) // we keep the original for later reference
       })
@@ -335,13 +328,14 @@ async function getRebar3Versions() {
   return rebar3VersionsListing
 }
 
+function isStrictVersion() {
+  return core.getInput('version-type', { required: false }) === 'strict'
+}
+
 function getVersionFromSpec(spec, versions) {
   let version = null
 
-  if (
-    spec.match(/rc/) ||
-    core.getInput('version-type', { required: false }) === 'strict'
-  ) {
+  if (spec.match(/rc/) || isStrictVersion()) {
     version = spec
   }
 
@@ -404,6 +398,7 @@ function getRunnerOSVersion() {
   const ImageOSToContainer = {
     ubuntu18: 'ubuntu-18.04',
     ubuntu20: 'ubuntu-20.04',
+    ubuntu22: 'ubuntu-22.04',
     win19: 'windows-2019',
     win22: 'windows-2022',
   }

test-projects/gleam_gleam/.github/workflows/test.yml

@@ -15,7 +15,7 @@ jobs:
       - uses: erlef/setup-beam@v1.9.0
         with:
           otp-version: "23.2"
-          gleam-version: "0.19.0-rc3"
+          gleam-version: "0.23.0-rc1"
       - run: gleam format --check src test
       - run: gleam deps download
       - run: gleam test

test-projects/gleam_gleam/manifest.toml

@@ -2,8 +2,8 @@
 # You typically do not need to edit this file
 
 packages = [
-  { name = "gleam_stdlib", version = "0.19.2", build_tools = ["gleam"], requirements = [], otp_app = "gleam_stdlib", source = "hex", outer_checksum = "FFA79EA12369F122B68885E694E097D6810402A2F86BFF48AAE9E40ACE654F4C" },
-  { name = "gleeunit", version = "0.6.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleeunit", source = "hex", outer_checksum = "77701A5E5A565727E1EEAC9196FB878D544049B6331CD0305B5A69699135EA1C" },
+  { name = "gleam_stdlib", version = "0.22.3", build_tools = ["gleam"], requirements = [], otp_app = "gleam_stdlib", source = "hex", outer_checksum = "F2C2D389B06426E1289D5419F89BDE8E0F7F35A40B2BBB3C88188481F0D44A9F" },
+  { name = "gleeunit", version = "0.6.2", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleeunit", source = "hex", outer_checksum = "A006864621DB80C4FBB0746580703502FD81A4D38D23FCB20A8120984D353DF0" },
 ]
 
 [requirements]

test-projects/gleam_rebar3/.github/workflows/test.yml

@@ -1,23 +0,0 @@
-name: test
-
-on:
-  push:
-    branches:
-      - master
-      - main
-  pull_request:
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2.0.0
-      - uses: gleam-lang/setup-erlang@v1.1.2
-        with:
-          otp-version: 23.2
-      - uses: gleam-lang/setup-gleam@v1.0.2
-        with:
-          gleam-version: 0.16.1
-      - run: rebar3 install_deps
-      - run: rebar3 eunit
-      - run: gleam format --check src test

test-projects/gleam_rebar3/.gitignore

@@ -1,21 +0,0 @@
-*.beam
-*.iml
-*.o
-*.plt
-*.swo
-*.swp
-*~
-.erlang.cookie
-.eunit
-.idea
-.rebar
-.rebar3
-_*
-_build
-docs
-ebin
-erl_crash.dump
-gen
-log
-logs
-rebar3.crashdump

test-projects/gleam_rebar3/README.md

@@ -1,24 +0,0 @@
-# gleam_rebar3
-
-A Gleam project
-
-## Quick start
-
-```sh
-# Run the eunit tests
-rebar3 eunit
-
-# Run the Erlang REPL
-rebar3 shell
-```
-
-## Installation
-
-If [available in Hex](https://rebar3.org/docs/configuration/dependencies/#declaring-dependencies)
-this package can be installed by adding `gleam_rebar3` to your `rebar.config` dependencies:
-
-```erlang
-{deps, [
-    gleam_rebar3
-]}.
-```

test-projects/gleam_rebar3/gleam.toml

@@ -1,3 +0,0 @@
-name = "gleam_rebar3"
-
-# repository = { type = "github", user = "my-user", repo = "gleam_rebar3" }

test-projects/gleam_rebar3/rebar.config

@@ -1,12 +0,0 @@
-{erl_opts, [debug_info]}.
-{src_dirs, ["src", "gen/src"]}.
-
-{profiles, [
-    {test, [{src_dirs, ["src", "test", "gen/src", "gen/test"]}]}
-]}.
-
-{project_plugins, [rebar_gleam]}.
-
-{deps, [
-    {gleam_stdlib, "0.16.0"}
-]}.

test-projects/gleam_rebar3/src/gleam_rebar3.app.src

@@ -1,15 +0,0 @@
-{application, gleam_rebar3,
- [{description, "A Gleam project"},
-  {vsn, "0.1.0"},
-  {registered, []},
-  {applications,
-   [kernel,
-    stdlib,
-    gleam_stdlib
-   ]},
-  {env,[]},
-  {modules, []},
-
-  {include_files, ["gleam.toml", "gen"]},
-  {links, []}
-]}.

test-projects/gleam_rebar3/src/gleam_rebar3.gleam

@@ -1,3 +0,0 @@
-pub fn hello_world() -> String {
-  "Hello, from gleam_rebar3!"
-}

test-projects/gleam_rebar3/test/gleam_rebar3_test.gleam

@@ -1,7 +0,0 @@
-import gleam_rebar3
-import gleam/should
-
-pub fn hello_world_test() {
-  gleam_rebar3.hello_world()
-  |> should.equal("Hello, from gleam_rebar3!")
-}