diff options
| -rw-r--r-- | .github/workflows/update-elixir-patches.yaml | 9 | ||||
| -rw-r--r-- | WORKSPACE | 7 | ||||
| -rw-r--r-- | bazel/platforms/BUILD.bazel | 5 |
3 files changed, 0 insertions, 21 deletions
diff --git a/.github/workflows/update-elixir-patches.yaml b/.github/workflows/update-elixir-patches.yaml index 8d77d0f8f3..94620adda8 100644 --- a/.github/workflows/update-elixir-patches.yaml +++ b/.github/workflows/update-elixir-patches.yaml @@ -16,13 +16,9 @@ jobs: - elixir_version: "1.12" name: '1_12' - elixir_version: "1.13" -<<<<<<< HEAD - name_suffix: '_1_13' -======= name: '1_13' - elixir_version: "1.14" name: '1_14' ->>>>>>> 502730b32d (Apply the @erlang_config pattern for elixir via the WORKSPACE) timeout-minutes: 10 steps: - name: CHECKOUT REPOSITORY @@ -40,10 +36,6 @@ jobs: TAG_NAME=$(curl -s GET https://api.github.com/repos/elixir-lang/elixir/tags?per_page=100 \ | jq -r 'map(select(.name | contains("v${{ matrix.elixir_version }}"))) | first | .name') -<<<<<<< HEAD - wget --continue --quiet --output-document="/tmp/elixir.tar.gz" "https://github.com/elixir-lang/elixir/archive/${TAG_NAME}.tar.gz" && \ - SHA=$(shasum -a 256 "/tmp/elixir.tar.gz" | awk '{print $1}') -======= if [[ -z "${TAG_NAME}" ]]; then echo "Failed to determine latest TAG_NAME for v${{ matrix.elixir_version }}" exit 1 @@ -52,7 +44,6 @@ jobs: ARCHIVE_URL="https://github.com/elixir-lang/elixir/archive/${TAG_NAME}.tar.gz" wget --continue --quiet --output-document="/tmp/elixir.tar.gz" "${ARCHIVE_URL}" && \ SHA="$(shasum -a 256 "/tmp/elixir.tar.gz" | awk '{print $1}')" ->>>>>>> 502730b32d (Apply the @erlang_config pattern for elixir via the WORKSPACE) if [ -z "${SHA}" ]; then echo "Failed to determine SHA for ${TAG_NAME}" @@ -150,12 +150,6 @@ load("@erlang_config//:defaults.bzl", "register_defaults") register_defaults() -<<<<<<< HEAD -register_toolchains( - "//bazel/toolchains:elixir_toolchain_external", - "//bazel/toolchains:elixir_toolchain_1_13", - "//bazel/toolchains:elixir_toolchain_1_14", -======= load( "//bazel/elixir:elixir.bzl", "elixir_config", @@ -191,7 +185,6 @@ elixir_config( load( "@elixir_config//:defaults.bzl", register_elixir_defaults = "register_defaults", ->>>>>>> 502730b32d (Apply the @erlang_config pattern for elixir via the WORKSPACE) ) register_elixir_defaults() diff --git a/bazel/platforms/BUILD.bazel b/bazel/platforms/BUILD.bazel index 58abd171ca..7a3e07131f 100644 --- a/bazel/platforms/BUILD.bazel +++ b/bazel/platforms/BUILD.bazel @@ -41,13 +41,8 @@ platform( platform( name = "erlang_linux_git_master_platform", constraint_values = [ -<<<<<<< HEAD - "@erlang_config//:erlang_master", - ":elixir_1_14", -======= "@erlang_config//:erlang_26", "@elixir_config//:elixir_1_14", ->>>>>>> 502730b32d (Apply the @erlang_config pattern for elixir via the WORKSPACE) ], parents = ["@rbe//config:platform"], ) |