From a104ffa46d9e25a25aa42feac8642705a51941a8 Mon Sep 17 00:00:00 2001 From: Philip Kuryloski Date: Mon, 13 Jun 2022 12:22:34 +0200 Subject: [PATCH 1/9] Add rules_erlang 3.2.0 https://github.com/rabbitmq/rules_erlang/releases/tag/3.2.0 --- modules/rules_erlang/3.1.0/presubmit.yml | 6 +++--- modules/rules_erlang/3.2.0/MODULE.bazel | 26 ++++++++++++++++++++++++ modules/rules_erlang/3.2.0/presubmit.yml | 24 ++++++++++++++++++++++ modules/rules_erlang/3.2.0/source.json | 5 +++++ modules/rules_erlang/metadata.json | 3 ++- 5 files changed, 60 insertions(+), 4 deletions(-) create mode 100644 modules/rules_erlang/3.2.0/MODULE.bazel create mode 100644 modules/rules_erlang/3.2.0/presubmit.yml create mode 100644 modules/rules_erlang/3.2.0/source.json diff --git a/modules/rules_erlang/3.1.0/presubmit.yml b/modules/rules_erlang/3.1.0/presubmit.yml index ad75b975cdc..fb0f6fc3b51 100644 --- a/modules/rules_erlang/3.1.0/presubmit.yml +++ b/modules/rules_erlang/3.1.0/presubmit.yml @@ -17,8 +17,8 @@ tasks: - | ERLANG_HOME="$(realpath ~/kerl/${ERLANG_VERSION})" cat << EOF >> user.bazelrc - build --//:erlang_version=${ERLANG_VERSION} - build --//:erlang_home=${ERLANG_HOME} + build --@rules_erlang//:erlang_version=${ERLANG_VERSION} + build --@rules_erlang//:erlang_home=${ERLANG_HOME} EOF build_targets: - - '//...' + - '@rules_erlang//...' diff --git a/modules/rules_erlang/3.2.0/MODULE.bazel b/modules/rules_erlang/3.2.0/MODULE.bazel new file mode 100644 index 00000000000..6bc2a6f1262 --- /dev/null +++ b/modules/rules_erlang/3.2.0/MODULE.bazel @@ -0,0 +1,26 @@ +module( + name = "rules_erlang", + version = "3.2.0", + compatibility_level = 3, +) + +bazel_dep( + name = "rules_pkg", + version = "0.5.1", +) + +bazel_dep( + name = "bazel_skylib", + version = "1.2.0", +) + +erlang_package = use_extension( + "//bzlmod:extensions.bzl", + "erlang_package", +) + +use_repo( + erlang_package, + "getopt_src", + "xref_runner_src", +) diff --git a/modules/rules_erlang/3.2.0/presubmit.yml b/modules/rules_erlang/3.2.0/presubmit.yml new file mode 100644 index 00000000000..fb0f6fc3b51 --- /dev/null +++ b/modules/rules_erlang/3.2.0/presubmit.yml @@ -0,0 +1,24 @@ +matrix: + platform: + - ubuntu2004 + - macos +tasks: + verify_targets: + name: Verify build targets + platform: ${{ platform }} + environment: + ERLANG_VERSION: "24.3" + shell_commands: + - curl -O https://raw.githubusercontent.com/kerl/kerl/master/kerl + - chmod a+x kerl + - ./kerl update releases + - ./kerl build ${ERLANG_VERSION} + - ./kerl install ${ERLANG_VERSION} ~/kerl/${ERLANG_VERSION} + - | + ERLANG_HOME="$(realpath ~/kerl/${ERLANG_VERSION})" + cat << EOF >> user.bazelrc + build --@rules_erlang//:erlang_version=${ERLANG_VERSION} + build --@rules_erlang//:erlang_home=${ERLANG_HOME} + EOF + build_targets: + - '@rules_erlang//...' diff --git a/modules/rules_erlang/3.2.0/source.json b/modules/rules_erlang/3.2.0/source.json new file mode 100644 index 00000000000..191b7e0bbb6 --- /dev/null +++ b/modules/rules_erlang/3.2.0/source.json @@ -0,0 +1,5 @@ +{ + "integrity": "sha256-tHdPZMvQ+d+5JUETcogiSMEpu2Obf2gwhfV7Ysjdmek=", + "strip_prefix": "rules_erlang-3.2.0", + "url": "https://github.com/rabbitmq/rules_erlang/archive/refs/tags/3.2.0.zip" +} diff --git a/modules/rules_erlang/metadata.json b/modules/rules_erlang/metadata.json index 6395935dc62..005e718d5ed 100644 --- a/modules/rules_erlang/metadata.json +++ b/modules/rules_erlang/metadata.json @@ -10,7 +10,8 @@ "versions": [ "2.4.0", "2.5.2", - "3.1.0" + "3.1.0", + "3.2.0" ], "yanked_versions": {} } From 12750c894609b0baeb17305149b51df6c9692da3 Mon Sep 17 00:00:00 2001 From: Philip Kuryloski Date: Fri, 17 Jun 2022 11:21:27 +0200 Subject: [PATCH 2/9] Use otp 25 for rules_erlang presubmit.yml --- modules/rules_erlang/3.2.0/presubmit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rules_erlang/3.2.0/presubmit.yml b/modules/rules_erlang/3.2.0/presubmit.yml index fb0f6fc3b51..5da14fa7020 100644 --- a/modules/rules_erlang/3.2.0/presubmit.yml +++ b/modules/rules_erlang/3.2.0/presubmit.yml @@ -7,7 +7,7 @@ tasks: name: Verify build targets platform: ${{ platform }} environment: - ERLANG_VERSION: "24.3" + ERLANG_VERSION: "25.0" shell_commands: - curl -O https://raw.githubusercontent.com/kerl/kerl/master/kerl - chmod a+x kerl From bbfa62e7c08bdf4e52bead9abc65adbaff612291 Mon Sep 17 00:00:00 2001 From: Rin Kuryloski Date: Thu, 11 Aug 2022 15:13:00 +0200 Subject: [PATCH 3/9] Register the toolchain in the MODULE.bazel file --- modules/rules_erlang/3.2.0/MODULE.bazel | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/rules_erlang/3.2.0/MODULE.bazel b/modules/rules_erlang/3.2.0/MODULE.bazel index 6bc2a6f1262..5eaa4e7aeb0 100644 --- a/modules/rules_erlang/3.2.0/MODULE.bazel +++ b/modules/rules_erlang/3.2.0/MODULE.bazel @@ -24,3 +24,7 @@ use_repo( "getopt_src", "xref_runner_src", ) + +register_toolchains( + "//:erlang_toolchain_external", +) From 670f48bb80904b1475a45219e09f9a7d4b7288b1 Mon Sep 17 00:00:00 2001 From: Rin Kuryloski Date: Thu, 11 Aug 2022 17:27:38 +0200 Subject: [PATCH 4/9] Register the erlang_toolchain_external via build_flags in presubmit As I recall we do not want unconditional registration for modules depending on rules_erlang --- modules/rules_erlang/3.2.0/MODULE.bazel | 4 ---- modules/rules_erlang/3.2.0/presubmit.yml | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/rules_erlang/3.2.0/MODULE.bazel b/modules/rules_erlang/3.2.0/MODULE.bazel index 5eaa4e7aeb0..6bc2a6f1262 100644 --- a/modules/rules_erlang/3.2.0/MODULE.bazel +++ b/modules/rules_erlang/3.2.0/MODULE.bazel @@ -24,7 +24,3 @@ use_repo( "getopt_src", "xref_runner_src", ) - -register_toolchains( - "//:erlang_toolchain_external", -) diff --git a/modules/rules_erlang/3.2.0/presubmit.yml b/modules/rules_erlang/3.2.0/presubmit.yml index 5da14fa7020..48608c75d44 100644 --- a/modules/rules_erlang/3.2.0/presubmit.yml +++ b/modules/rules_erlang/3.2.0/presubmit.yml @@ -20,5 +20,7 @@ tasks: build --@rules_erlang//:erlang_version=${ERLANG_VERSION} build --@rules_erlang//:erlang_home=${ERLANG_HOME} EOF + build_flags: + - --extra_toolchains=@rules_erlang//:erlang_toolchain_external build_targets: - '@rules_erlang//...' From b0e11b25606d5e41e8fca1cbc75c99dc80776548 Mon Sep 17 00:00:00 2001 From: Rin Kuryloski Date: Mon, 15 Aug 2022 08:41:34 +0200 Subject: [PATCH 5/9] Use --toolchain_resolution_debug for rules_erlang --- modules/rules_erlang/3.2.0/presubmit.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/rules_erlang/3.2.0/presubmit.yml b/modules/rules_erlang/3.2.0/presubmit.yml index 48608c75d44..a8ae3220e3f 100644 --- a/modules/rules_erlang/3.2.0/presubmit.yml +++ b/modules/rules_erlang/3.2.0/presubmit.yml @@ -22,5 +22,6 @@ tasks: EOF build_flags: - --extra_toolchains=@rules_erlang//:erlang_toolchain_external + - --toolchain_resolution_debug=@rules_erlang//tools:toolchain_type build_targets: - '@rules_erlang//...' From b2b1d703f1da8cba83e6ef0afb8fdd98e9d95f75 Mon Sep 17 00:00:00 2001 From: Rin Kuryloski Date: Mon, 15 Aug 2022 10:30:49 +0200 Subject: [PATCH 6/9] Additional --toolchain_resolution_debug flags --- modules/rules_erlang/3.2.0/presubmit.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/rules_erlang/3.2.0/presubmit.yml b/modules/rules_erlang/3.2.0/presubmit.yml index a8ae3220e3f..683d044e37c 100644 --- a/modules/rules_erlang/3.2.0/presubmit.yml +++ b/modules/rules_erlang/3.2.0/presubmit.yml @@ -23,5 +23,8 @@ tasks: build_flags: - --extra_toolchains=@rules_erlang//:erlang_toolchain_external - --toolchain_resolution_debug=@rules_erlang//tools:toolchain_type + - --toolchain_resolution_debug=@@rules_erlang~3.2.0//tools:toolchain_type + - --toolchain_resolution_debug=@rules_erlang~3.2.0//tools:toolchain_type + - --toolchain_resolution_debug=@rules_erlang.3.2.0//tools:toolchain_type build_targets: - '@rules_erlang//...' From 05b6dfc0dda2c8643e944f6e1f868cde0cac08b2 Mon Sep 17 00:00:00 2001 From: Rin Kuryloski Date: Mon, 15 Aug 2022 10:34:14 +0200 Subject: [PATCH 7/9] Add platforms to build_flags for rules_erlang --- modules/rules_erlang/3.2.0/presubmit.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/rules_erlang/3.2.0/presubmit.yml b/modules/rules_erlang/3.2.0/presubmit.yml index 683d044e37c..dd0181be458 100644 --- a/modules/rules_erlang/3.2.0/presubmit.yml +++ b/modules/rules_erlang/3.2.0/presubmit.yml @@ -22,6 +22,8 @@ tasks: EOF build_flags: - --extra_toolchains=@rules_erlang//:erlang_toolchain_external + - --platforms=@rules_erlang//platforms:erlang_external_platform + - --extra_execution_platforms=@rules_erlang//platforms:erlang_external_platform - --toolchain_resolution_debug=@rules_erlang//tools:toolchain_type - --toolchain_resolution_debug=@@rules_erlang~3.2.0//tools:toolchain_type - --toolchain_resolution_debug=@rules_erlang~3.2.0//tools:toolchain_type From ed64761d094cc5c597093c7bb1ee7498068efc3e Mon Sep 17 00:00:00 2001 From: Rin Kuryloski Date: Mon, 15 Aug 2022 10:46:02 +0200 Subject: [PATCH 8/9] More build_flag adjustments for rules_erlang --- modules/rules_erlang/3.2.0/presubmit.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/rules_erlang/3.2.0/presubmit.yml b/modules/rules_erlang/3.2.0/presubmit.yml index dd0181be458..9959743b6a8 100644 --- a/modules/rules_erlang/3.2.0/presubmit.yml +++ b/modules/rules_erlang/3.2.0/presubmit.yml @@ -16,17 +16,14 @@ tasks: - ./kerl install ${ERLANG_VERSION} ~/kerl/${ERLANG_VERSION} - | ERLANG_HOME="$(realpath ~/kerl/${ERLANG_VERSION})" - cat << EOF >> user.bazelrc + cat << EOF >> .bazelrc build --@rules_erlang//:erlang_version=${ERLANG_VERSION} build --@rules_erlang//:erlang_home=${ERLANG_HOME} EOF build_flags: + - --incompatible_strict_action_env - --extra_toolchains=@rules_erlang//:erlang_toolchain_external - --platforms=@rules_erlang//platforms:erlang_external_platform - --extra_execution_platforms=@rules_erlang//platforms:erlang_external_platform - - --toolchain_resolution_debug=@rules_erlang//tools:toolchain_type - - --toolchain_resolution_debug=@@rules_erlang~3.2.0//tools:toolchain_type - - --toolchain_resolution_debug=@rules_erlang~3.2.0//tools:toolchain_type - - --toolchain_resolution_debug=@rules_erlang.3.2.0//tools:toolchain_type build_targets: - '@rules_erlang//...' From 560240b32e36ff580768dde2333dbef029e3de2a Mon Sep 17 00:00:00 2001 From: Rin Kuryloski Date: Mon, 15 Aug 2022 10:57:25 +0200 Subject: [PATCH 9/9] Use Erlang 24.3 for rules_erlang tests --- modules/rules_erlang/3.2.0/presubmit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rules_erlang/3.2.0/presubmit.yml b/modules/rules_erlang/3.2.0/presubmit.yml index 9959743b6a8..a009c998ed4 100644 --- a/modules/rules_erlang/3.2.0/presubmit.yml +++ b/modules/rules_erlang/3.2.0/presubmit.yml @@ -7,7 +7,7 @@ tasks: name: Verify build targets platform: ${{ platform }} environment: - ERLANG_VERSION: "25.0" + ERLANG_VERSION: "24.3" shell_commands: - curl -O https://raw.githubusercontent.com/kerl/kerl/master/kerl - chmod a+x kerl