Automation: update setup-beam version output to c36fc0c

Co-authored-by: GitHub Actions <actions@user.noreply.github.com>

.github/workflows/action.yml

@@ -1,7 +1,14 @@
 ---
 name: action
 
-on: [push, workflow_dispatch]
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - "*"
+  workflow_dispatch: {}
 
 env:
   GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
@@ -27,6 +34,7 @@ jobs:
           git add dist/index.js
           git commit -m "Automation: update setup-beam version output to ${SHA}"
           git push origin main
+
   check_integrity:
     name: Expected local npm actions
     runs-on: ubuntu-latest

.github/workflows/hexpm-mirrors.yml

@@ -1,7 +1,14 @@
 ---
 name: hexpm-mirrors
 
-on: [push, workflow_dispatch]
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - "*"
+  workflow_dispatch: {}
 
 jobs:
   test-failing-first-mirror:

.github/workflows/ubuntu.yml

@@ -1,7 +1,14 @@
 ---
 name: ubuntu
 
-on: [push, workflow_dispatch]
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - "*"
+  workflow_dispatch: {}
 
 jobs:
   integration_test:
@@ -15,6 +22,8 @@ jobs:
       fail-fast: false
       matrix:
         combo:
+          - otp-version: 'OTP-27.0-rc1'
+            os: 'ubuntu-latest'
           - otp-version: '26.0'
             elixir-version: 'v1.14-otp-25'
             os: 'ubuntu-latest'
@@ -174,6 +183,7 @@ jobs:
           mix escript.install --force ${{matrix.combo.escript_packages}}
           ${{matrix.combo.escript_script}}
         if: ${{matrix.combo.escript_packages && matrix.combo.escript_script}}
+
   environment_variables:
     name: Environment variables
     runs-on: ${{matrix.combo.os}}
@@ -199,7 +209,7 @@ jobs:
       - run: env
       - name: Check environment variables
         run: |
-          ${INSTALL_DIR_FOR_ELIXIR}/elixir --version
-          ${INSTALL_DIR_FOR_GLEAM}/gleam --version
-          ${INSTALL_DIR_FOR_OTP}/erl -version
-          ${INSTALL_DIR_FOR_REBAR3}/rebar3 version
+          ${INSTALL_DIR_FOR_ELIXIR}/bin/elixir -v
+          ${INSTALL_DIR_FOR_GLEAM}/bin/gleam --version
+          ${INSTALL_DIR_FOR_OTP}/bin/erl -version
+          ${INSTALL_DIR_FOR_REBAR3}/bin/rebar3 version

.github/workflows/windows.yml

@@ -1,7 +1,14 @@
 ---
 name: windows
 
-on: [push, workflow_dispatch]
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - "*"
+  workflow_dispatch: {}
 
 jobs:
   integration_test:
@@ -15,6 +22,8 @@ jobs:
       fail-fast: false
       matrix:
         combo:
+          - otp-version: 'OTP-27.0-rc1'
+            os: 'windows-latest'
           - otp-version: '26.0'
             elixir-version: 'main'
             os: 'windows-latest'
@@ -112,6 +121,7 @@ jobs:
           mix escript.install --force ${{matrix.combo.escript_packages}}
           ${{matrix.combo.escript_script}}
         if: ${{matrix.combo.escript_packages && matrix.combo.escript_script}}
+
   environment_variables:
     name: Environment variables
     runs-on: ${{matrix.combo.os}}
@@ -137,8 +147,8 @@ jobs:
       - run: env
       - name: Check environment variables
         run: |
-          ${INSTALL_DIR_FOR_ELIXIR}/elixir --version
-          ${INSTALL_DIR_FOR_GLEAM}/gleam --version
-          ${INSTALL_DIR_FOR_OTP}/erl -version
-          ${INSTALL_DIR_FOR_REBAR3}/rebar3 version
-        shell: bash
+          & "$Env:INSTALL_DIR_FOR_ELIXIR/bin/elixir" "-v"
+          & "$Env:INSTALL_DIR_FOR_GLEAM/bin/gleam.exe" "--version"
+          & "$Env:INSTALL_DIR_FOR_OTP/bin/erl.exe" "+V"
+          & "$Env:INSTALL_DIR_FOR_REBAR3/bin/rebar3.cmd" "version"
+          & "$Env:INSTALL_DIR_FOR_REBAR3/bin/rebar3.ps1" "version"

.gitignore

@@ -1,3 +1,2 @@
 node_modules/**
-dist/.github/workflows
 test/.tool-versions

3RD_PARTY_LICENSES

@@ -118,7 +118,7 @@ THE SOFTWARE.
 
 -----
 
-The following software may be included in this product: @fastify/busboy. A copy of the source code may be downloaded from https://github.com/fastify/busboy.git. This software contains the following license and notice below:
+The following software may be included in this product: @fastify/busboy. A copy of the source code may be downloaded from git+https://github.com/fastify/busboy.git. This software contains the following license and notice below:
 
 Copyright Brian White. All rights reserved.
 
@@ -1566,6 +1566,32 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 -----
 
+The following software may be included in this product: es-define-property, es-errors. A copy of the source code may be downloaded from git+https://github.com/ljharb/es-define-property.git (es-define-property), git+https://github.com/ljharb/es-errors.git (es-errors). This software contains the following license and notice below:
+
+MIT License
+
+Copyright (c) 2024 Jordan Harband
+
+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.
+
+-----
+
 The following software may be included in this product: es6-error. A copy of the source code may be downloaded from https://github.com/bjyoungblood/es6-error.git. This software contains the following license and notice below:
 
 The MIT License (MIT)

README.md

@@ -53,9 +53,9 @@ and Erlang/OTP.
 |-                 |-           |-
 | ubuntu-18.04     | 17 - 25    | ✅
 | ubuntu-20.04     | 20 - 25    | ✅
-| ubuntu-22.04     | 24.2 - 25  | ✅
+| ubuntu-22.04     | 24.2 - 26  | ✅
 | windows-2019     | 21* - 25   | ✅
-| windows-2022     | 21* - 25   | ✅
+| windows-2022     | 21* - 26   | ✅
 
 **Note** *: prior to 23, Windows builds are only available for minor versions, e.g. 21.0, 21.3, 22.0, etc.
 
@@ -122,11 +122,11 @@ with the following correspondence.
 #### `.tool-versions` format
 
 | YML              | `.tool-versions` |
-|-                 |-
-| `otp-version`    | `erlang`
-| `elixir-version` | `elixir`
-| `gleam-version`  | `gleam`
-| `rebar3-version` | `rebar`
+|-                 |- |
+| `otp-version`    | `erlang` |
+| `elixir-version` | `elixir` |
+| `gleam-version`  | `gleam` |
+| `rebar3-version` | `rebar` |
 
 ### Example (Erlang/OTP + Elixir, on Ubuntu)
 
@@ -248,7 +248,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: erlef/setup-beam@v1
         with:
-          otp-version: '25'
+          otp-version: '26'
           # Use `cdn.jsdelivr.net/hex` as an alternative to `builds.hex.pm`
           hexpm-mirrors: https://cdn.jsdelivr.net/hex
 ```
@@ -266,7 +266,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: erlef/setup-beam@v1
         with:
-          otp-version: '25'
+          otp-version: '26'
           hexpm-mirrors: |
             https://builds.hex.pm
             https://cdn.jsdelivr.net/hex
@@ -282,6 +282,9 @@ environment variables:
 - `INSTALL_DIR_FOR_GLEAM`: base folder for Gleam
 - `INSTALL_DIR_FOR_REBAR3`: base folder for `rebar3`
 
+In each of these you'll find folder `bin` where the appropriate binaries, platform-dependant,
+are found (i.e. `erl`, `erl.exe`, `rebar3`, `rebar3.exe`, ...).
+
 ## Elixir Problem Matchers
 
 The Elixir Problem Matchers in this repository are adapted from

package.json

@@ -11,7 +11,9 @@
     "shellcheck": "shellcheck .github/workflows/*.sh",
     "test": "node test/setup-beam.test.js",
     "yamllint": "yamllint .github/workflows/**.yml && yamllint .*.yml && yamllint *.yml",
-    "build-dist": "rm -rf ./dist && npm install && npm run build && npm run format && npm run markdownlint && npm run shellcheck && npm run yamllint && npm run jslint"
+    "clean-dist": "rm -rf ./dist",
+    "lint": "npm run markdownlint && npm run shellcheck && npm run yamllint && npm run jslint",
+    "build-dist": "npm run clean-dist && npm install && npm run build && npm run format && npm run lint"
   },
   "dependencies": {
     "@actions/core": "1.10.0",

src/setup-beam.js

@@ -49,7 +49,7 @@ async function main() {
   await maybeInstallRebar3(rebar3Spec)
 
   // undefined is replaced by a function, post- main branch merge
-  const setupBeamVersion = '6c8deb6'
+  const setupBeamVersion = 'c36fc0c'
   core.setOutput('setup-beam-version', setupBeamVersion)
 }
 
@@ -135,7 +135,6 @@ async function maybeInstallGleam(gleamSpec) {
     core.startGroup(`Installing Gleam ${gleamVersion}`)
     await install('gleam', { toolVersion: gleamVersion })
     core.setOutput('gleam-version', gleamVersion)
-    core.addPath(`${process.env.RUNNER_TEMP}/.setup-beam/gleam/bin`)
     core.endGroup()
 
     installed = true
@@ -156,7 +155,6 @@ async function maybeInstallRebar3(rebar3Spec) {
     core.startGroup(`Installing rebar3 ${rebar3Version}`)
     await install('rebar3', { toolVersion: rebar3Version })
     core.setOutput('rebar3-version', rebar3Version)
-    core.addPath(`${process.env.RUNNER_TEMP}/.setup-beam/rebar3/bin`)
     core.endGroup()
 
     installed = true
@@ -593,7 +591,7 @@ alongside ${alternativeName}=${alternativeValue} \
 }
 
 function parseVersionFile(versionFilePath0) {
-  const versionFilePath = path.join(
+  const versionFilePath = path.resolve(
     process.env.GITHUB_WORKSPACE,
     versionFilePath0,
   )
@@ -733,8 +731,9 @@ async function install(toolName, opts) {
           reportVersion: () => {
             const cmd = 'erl'
             const args = ['-version']
+            const env = {}
 
-            return [cmd, args]
+            return [cmd, args, env]
           },
         },
         win32: {
@@ -750,8 +749,9 @@ async function install(toolName, opts) {
           reportVersion: () => {
             const cmd = 'erl.exe'
             const args = ['+V']
+            const env = {}
 
-            return [cmd, args]
+            return [cmd, args, env]
           },
         },
       }
@@ -779,8 +779,9 @@ async function install(toolName, opts) {
           reportVersion: () => {
             const cmd = 'elixir'
             const args = ['-v']
+            const env = {}
 
-            return [cmd, args]
+            return [cmd, args, env]
           },
         },
       }
@@ -819,8 +820,9 @@ async function install(toolName, opts) {
           reportVersion: () => {
             const cmd = 'gleam'
             const args = ['--version']
+            const env = {}
 
-            return [cmd, args]
+            return [cmd, args, env]
           },
         },
         win32: {
@@ -852,8 +854,9 @@ async function install(toolName, opts) {
           reportVersion: () => {
             const cmd = 'gleam.exe'
             const args = ['--version']
+            const env = {}
 
-            return [cmd, args]
+            return [cmd, args, env]
           },
         },
       }
@@ -884,8 +887,12 @@ async function install(toolName, opts) {
           reportVersion: () => {
             const cmd = 'rebar3'
             const args = ['version']
+            const env = {
+              REBAR_GLOBAL_CONFIG_DIR: '/fake-dir',
+              REBAR_CONFIG: 'fake.config',
+            }
 
-            return [cmd, args]
+            return [cmd, args, env]
           },
         },
         win32: {
@@ -920,8 +927,9 @@ async function install(toolName, opts) {
           reportVersion: () => {
             const cmd = 'rebar3.cmd'
             const args = ['version']
+            const env = {}
 
-            return [cmd, args]
+            return [cmd, args, env]
           },
         },
       }
@@ -954,20 +962,29 @@ async function installTool(opts) {
     core.debug(`  ... it is, at ${cachePath}`)
   }
 
-  core.debug('Performing post extract operations...')
-  await platformOpts.postExtract(cachePath)
+  // This makes sure we run, e.g. in Windows, the installer in the runner
+  // We're not caching the install, just the downloaded tool
+  const runnerToolPath = path.join(
+    process.env.RUNNER_TEMP,
+    '.setup-beam',
+    toolName,
+  )
+  fs.cpSync(cachePath, runnerToolPath, { recursive: true })
 
-  core.debug(`Adding ${cachePath}'s bin to system path`)
-  const catchPathBin = path.join(cachePath, 'bin')
-  core.addPath(catchPathBin)
+  core.debug('Performing post extract operations...')
+  await platformOpts.postExtract(runnerToolPath)
+
+  core.debug(`Adding ${runnerToolPath}' bin to system path`)
+  const runnerToolPathBin = path.join(runnerToolPath, 'bin')
+  core.addPath(runnerToolPathBin)
 
   const installDirForVarName = `INSTALL_DIR_FOR_${toolName}`.toUpperCase()
-  core.debug(`Exporting ${installDirForVarName} as ${catchPathBin}`)
-  core.exportVariable(installDirForVarName, catchPathBin)
+  core.debug(`Exporting ${installDirForVarName} as ${runnerToolPath}`)
+  core.exportVariable(installDirForVarName, runnerToolPath)
 
   core.info(`Installed ${installOpts.tool} version`)
-  const [cmd, args] = platformOpts.reportVersion()
-  await exec(cmd, args)
+  const [cmd, args, env] = platformOpts.reportVersion()
+  await exec(cmd, args, { env: { ...process.env, ...env } })
 }
 
 function checkPlatform() {

test/setup-beam.test.js

@@ -8,6 +8,8 @@ simulateInput('hexpm-mirrors', 'https://builds.hex.pm', { multiline: true })
 
 const assert = require('assert')
 const fs = require('fs')
+const os = require('os')
+const path = require('path')
 const core = require('@actions/core')
 const setupBeam = require('../src/setup-beam')
 const { problemMatcher } = require('../matchers/elixir-matchers.json')
@@ -535,6 +537,14 @@ rebar ${rebar3}`
   assert.strictEqual(appVersions.get('erlang'), erlang)
   assert.strictEqual(appVersions.get('elixir'), elixir)
 
+  const absoluteFilename = path.join(os.tmpdir(), '.tool-versions')
+  fs.writeFileSync(absoluteFilename, toolVersions)
+
+  process.env.GITHUB_WORKSPACE = process.cwd()
+  const absoluteAppVersions = setupBeam.parseVersionFile(absoluteFilename)
+  assert.strictEqual(absoluteAppVersions.get('erlang'), erlang)
+  assert.strictEqual(absoluteAppVersions.get('elixir'), elixir)
+
   assert.ok(async () => {
     await setupBeam.install('otp', { toolVersion: erlang })
   })