Fix OTP archive root

Author: ericmj

scripts/release_hex.sh

@@ -136,14 +136,15 @@ function build {
 
   echo "Building ${elixir_version} ${otp_version} ${ubuntu_version}"
   rm -rf _build src/mix_safe_erl_term.erl
+  archive_ez=hex-${hex_version}.ez
   hex_ez=hex-${hex_version}-otp-${otp_release}.ez
 
   mkdir -p "$installs_dir/${saved_elixir_version}"
   docker run -v $(pwd):/hex hexpm/elixir:${elixir_version}-erlang-${otp_version}-ubuntu-${ubuntu_version} sh -c " \
     cd /hex && \
-    MIX_ENV=prod mix archive.build -o ${hex_ez}"
+    MIX_ENV=prod mix archive.build -o ${archive_ez}"
 
-  mv "${hex_ez}" "${installs_dir}/${saved_elixir_version}/${hex_ez}"
+  mv "${archive_ez}" "${installs_dir}/${saved_elixir_version}/${hex_ez}"
   sha=$(shasum -a 512 "${installs_dir}/${saved_elixir_version}/${hex_ez}")
   sha=($sha)
   echo "${hex_version},${sha},${saved_elixir_version},${otp_release}" >> "${hex_csv}"

test/scripts/release_hex_test.exs

@@ -0,0 +1,91 @@
+defmodule ReleaseHexTest do
+  use ExUnit.Case, async: true
+
+  @script Path.expand("../../scripts/release_hex.sh", __DIR__)
+
+  test "OTP-specific archives are built with the canonical internal directory" do
+    tmp = Path.join(System.tmp_dir!(), "hex-release-#{System.unique_integer([:positive])}")
+    bin = Path.join(tmp, "bin")
+
+    on_exit(fn -> File.rm_rf!(tmp) end)
+
+    File.rm_rf!(tmp)
+    File.mkdir_p!(bin)
+    File.mkdir_p!(Path.join(tmp, "tmp"))
+
+    docker_log = Path.join(tmp, "docker.log")
+    write_aws_stub(Path.join(bin, "aws"))
+    write_docker_stub(Path.join(bin, "docker"))
+
+    path = bin <> ":" <> System.get_env("PATH", "")
+
+    {output, status} =
+      System.cmd("bash", [@script, "--dry-run", "2.4.3"],
+        cd: tmp,
+        env: [{"PATH", path}, {"HEX_RELEASE_TEST_DOCKER_LOG", docker_log}],
+        stderr_to_stdout: true
+      )
+
+    assert status == 0, output
+
+    docker_commands = File.read!(docker_log)
+
+    assert docker_commands =~ "MIX_ENV=prod mix archive.build -o hex-2.4.3.ez"
+    refute docker_commands =~ "MIX_ENV=prod mix archive.build -o hex-2.4.3-otp-"
+
+    archives = Path.wildcard(Path.join([tmp, "tmp", "installs", "*", "hex-2.4.3-otp-*.ez"]))
+
+    assert archives != []
+    assert Enum.all?(archives, &(File.read!(&1) == "hex-2.4.3.ez\n"))
+  end
+
+  defp write_aws_stub(path) do
+    File.write!(path, """
+    #!/bin/sh
+    if [ "$1" = "s3" ] && [ "$2" = "cp" ]; then
+      src="$3"
+      dest="$4"
+
+      case "$src" in
+        s3://*)
+          mkdir -p "$(dirname "$dest")"
+          : > "$dest"
+          exit 0
+          ;;
+      esac
+    fi
+
+    exit 0
+    """)
+
+    File.chmod!(path, 0o755)
+  end
+
+  defp write_docker_stub(path) do
+    File.write!(path, """
+    #!/bin/sh
+    printf '%s\\n' "$*" >> "$HEX_RELEASE_TEST_DOCKER_LOG"
+
+    cmd=""
+    while [ "$#" -gt 0 ]; do
+      if [ "$1" = "-c" ]; then
+        shift
+        cmd="$1"
+        break
+      fi
+
+      shift
+    done
+
+    output=$(printf '%s\\n' "$cmd" | sed -n 's/.*mix archive.build -o \\([^ "]*\\).*/\\1/p')
+
+    if [ -n "$output" ]; then
+      printf '%s\\n' "$output" > "$output"
+    fi
+
+    exit 0
+    """)
+
+    File.chmod!(path, 0o755)
+  end
+end