From 033f1034211ab8be21f54cbd0547fbb06e31860f Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Mon, 21 Jul 2025 17:28:20 +0000 Subject: [PATCH] Automation: update setup-beam version output to 9afaa6e --- dist/index.js | 12 ++++++++---- src/setup-beam.js | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dist/index.js b/dist/index.js index 5f6c4b9..c77e31c 100644 --- a/dist/index.js +++ b/dist/index.js @@ -25933,7 +25933,7 @@ async function main() { await maybeInstallRebar3(rebar3Spec) // undefined is replaced by a function, post- main branch merge - const setupBeamVersion = '8c38699' + const setupBeamVersion = '9afaa6e' core.setOutput('setup-beam-version', setupBeamVersion) } @@ -28058,7 +28058,7 @@ const normalize_options = function (opts) { // Normalize option `to` if (options.to === undefined || options.to === null) { options.to = -1; - } else { + } else if (options.to !== -1) { if (typeof options.to === "string" && /\d+/.test(options.to)) { options.to = parseInt(options.to); } @@ -28077,7 +28077,7 @@ const normalize_options = function (opts) { // Normalize option `to_line` if (options.to_line === undefined || options.to_line === null) { options.to_line = -1; - } else { + } else if (options.to_line !== -1) { if (typeof options.to_line === "string" && /\d+/.test(options.to_line)) { options.to_line = parseInt(options.to_line); } @@ -28208,10 +28208,14 @@ const transform = function (original_options = {}) { this.state.bufBytesStart += bomLength; buf = buf.slice(bomLength); // Renormalize original options with the new encoding - this.options = normalize_options({ + const options = normalize_options({ ...this.original_options, encoding: encoding, }); + // Properties are merged with the existing options instance + for (const key in options) { + this.options[key] = options[key]; + } // Options will re-evaluate the Buffer with the new encoding ({ comment, escape, quote } = this.options); break; diff --git a/src/setup-beam.js b/src/setup-beam.js index f0e2828..73e65c0 100644 --- a/src/setup-beam.js +++ b/src/setup-beam.js @@ -53,7 +53,7 @@ async function main() { await maybeInstallRebar3(rebar3Spec) // undefined is replaced by a function, post- main branch merge - const setupBeamVersion = '8c38699' + const setupBeamVersion = '9afaa6e' core.setOutput('setup-beam-version', setupBeamVersion) }