From 723c53e1dff473aecf479892a54e2015a7e659c1 Mon Sep 17 00:00:00 2001 From: Badlop Date: Sat, 24 Feb 2024 17:14:36 +0100 Subject: [PATCH] Revert "Container: Update make-binaries to support setup-beam v1.17.2" We can now revert commit c81a47a692494fb36c3e169e07f34ef6686612fc because erlef/setup-beam v1.17.3 has recovered its original behavior in https://github.com/erlef/setup-beam/commit/951dd857ae77719ae708c8feb0d9224247a5ac43 --- .github/workflows/container.yml | 2 +- tools/make-binaries | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index d9810d370..8d6056f17 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -49,7 +49,7 @@ jobs: sudo apt-get -qq install python3-dev texinfo unzip - name: Install erlang/OTP - uses: erlef/setup-beam@v1.17.2 + uses: erlef/setup-beam@v1 with: otp-version: ${{ env.OTP_VSN }} elixir-version: ${{ env.ELIXIR_VSN }} diff --git a/tools/make-binaries b/tools/make-binaries index d91cd8610..0c63b7c16 100755 --- a/tools/make-binaries +++ b/tools/make-binaries @@ -350,8 +350,8 @@ add_otp_path() then # For github runners to build for non-native systems: # https://github.com/erlef/setup-beam#environment-variables - native_otp_bin="$INSTALL_DIR_FOR_OTP" - native_elixir_bin="$INSTALL_DIR_FOR_ELIXIR" + native_otp_bin="$INSTALL_DIR_FOR_OTP/bin" + native_elixir_bin="$INSTALL_DIR_FOR_ELIXIR/bin" export PATH="$native_elixir_bin:$PATH" fi export PATH="$native_otp_bin:$PATH"