From c85b7caba04db72aa29d99626b0920598627e42e Mon Sep 17 00:00:00 2001 From: Rin Kuryloski Date: Wed, 20 Sep 2023 12:35:41 +0200 Subject: [PATCH 1/2] Use OTP 26.1 as OTP 26 in CI (cherry picked from commit 75eb0621fcdef9114ffeb77f5ec6876d707d5a93) # Conflicts: # .github/workflows/check-build-system-equivalence-release-branches.yaml # .github/workflows/test-windows.yaml --- .bazelrc | 5 ++++- ...build-system-equivalence-release-branches.yaml | 15 +++++++++++++++ .../workflows/check-build-system-equivalence.yaml | 2 +- .github/workflows/oci.yaml | 2 +- .github/workflows/test-authnz.yaml | 6 +++--- .github/workflows/test-selenium.yaml | 6 +++--- .github/workflows/test-windows.yaml | 5 +++++ .github/workflows/update-otp-patches.yaml | 6 +++--- MODULE.bazel | 10 +++++----- WORKSPACE | 8 ++++---- bazel/platforms/BUILD.bazel | 4 ++-- packaging/docker-image/BUILD.bazel | 2 +- 12 files changed, 47 insertions(+), 24 deletions(-) diff --git a/.bazelrc b/.bazelrc index 925c42ec24d..dd75fa933f1 100644 --- a/.bazelrc +++ b/.bazelrc @@ -65,7 +65,10 @@ build:rbe-25_3 --config=rbe build:rbe-25_3 --platforms=//bazel/platforms:erlang_linux_25_3_platform build:rbe-26 --config=rbe -build:rbe-26 --platforms=//bazel/platforms:erlang_linux_26_platform +build:rbe-26 --platforms=//bazel/platforms:erlang_linux_26_1_platform + +build:rbe-26_1 --config=rbe +build:rbe-26_1 --platforms=//bazel/platforms:erlang_linux_26_1_platform # no-op config so that --config=local does not error build:local --color=auto diff --git a/.github/workflows/check-build-system-equivalence-release-branches.yaml b/.github/workflows/check-build-system-equivalence-release-branches.yaml index bc29ce9f1d7..843720b8d2f 100644 --- a/.github/workflows/check-build-system-equivalence-release-branches.yaml +++ b/.github/workflows/check-build-system-equivalence-release-branches.yaml @@ -6,23 +6,38 @@ jobs: check-main: uses: ./.github/workflows/check-build-system-equivalence.yaml with: +<<<<<<< HEAD ref: main erlang_version: 26.0 +======= + ref: refs/heads/main + erlang_version: 26.1 +>>>>>>> 75eb0621fc (Use OTP 26.1 as OTP 26 in CI) elixir_version: 1.15 project_version: 3.13.0 check-v3_12_x: uses: ./.github/workflows/check-build-system-equivalence.yaml with: +<<<<<<< HEAD ref: v3.12.x erlang_version: 26.0 +======= + ref: refs/heads/v3.12.x + erlang_version: 26.1 +>>>>>>> 75eb0621fc (Use OTP 26.1 as OTP 26 in CI) elixir_version: 1.15 project_version: 3.12.0 check-v3_11_x: uses: ./.github/workflows/check-build-system-equivalence.yaml with: +<<<<<<< HEAD ref: v3.11.x erlang_version: 26.0 +======= + ref: refs/heads/v3.11.x + erlang_version: 26.1 +>>>>>>> 75eb0621fc (Use OTP 26.1 as OTP 26 in CI) elixir_version: 1.15 project_version: 3.11.0 diff --git a/.github/workflows/check-build-system-equivalence.yaml b/.github/workflows/check-build-system-equivalence.yaml index 494f8f692a2..4a7f9ce91e3 100644 --- a/.github/workflows/check-build-system-equivalence.yaml +++ b/.github/workflows/check-build-system-equivalence.yaml @@ -19,7 +19,7 @@ on: erlang_version: description: 'OTP version to build with' required: true - default: "26.0" + default: "26.1" elixir_version: description: 'Elixir version to build with' required: true diff --git a/.github/workflows/oci.yaml b/.github/workflows/oci.yaml index af191e93de4..9936d562d7c 100644 --- a/.github/workflows/oci.yaml +++ b/.github/workflows/oci.yaml @@ -36,7 +36,7 @@ jobs: - image_tag_suffix: otp-min-bazel otp_version_id: 25_0 - image_tag_suffix: otp-max-bazel - otp_version_id: 26 + otp_version_id: 26_1 steps: - name: Free Disk Space (Ubuntu) uses: jlumbroso/free-disk-space@main diff --git a/.github/workflows/test-authnz.yaml b/.github/workflows/test-authnz.yaml index f0e5cf71427..4f8f43c5438 100644 --- a/.github/workflows/test-authnz.yaml +++ b/.github/workflows/test-authnz.yaml @@ -31,12 +31,12 @@ jobs: fail-fast: false matrix: erlang_version: - - "26.0" + - "26.1" browser: - chrome include: - - erlang_version: "26.0" - elixir_version: 1.14.5 + - erlang_version: "26.1" + elixir_version: 1.15.2 env: SELENIUM_DIR: deps/rabbitmq_management/selenium DOCKER_NETWORK: rabbitmq_net diff --git a/.github/workflows/test-selenium.yaml b/.github/workflows/test-selenium.yaml index 1a4c745da6b..6ac35ff4172 100644 --- a/.github/workflows/test-selenium.yaml +++ b/.github/workflows/test-selenium.yaml @@ -31,12 +31,12 @@ jobs: fail-fast: false matrix: erlang_version: - - "26.0" + - "26.1" browser: - chrome include: - - erlang_version: "26.0" - elixir_version: 1.14.5 + - erlang_version: "26.1" + elixir_version: 1.15.2 env: SELENIUM_DIR: deps/rabbitmq_management/selenium DOCKER_NETWORK: rabbitmq_net diff --git a/.github/workflows/test-windows.yaml b/.github/workflows/test-windows.yaml index be7769be223..3d4936f329b 100644 --- a/.github/workflows/test-windows.yaml +++ b/.github/workflows/test-windows.yaml @@ -11,8 +11,13 @@ jobs: fail-fast: false matrix: include: +<<<<<<< HEAD - erlang_version: "26.0" elixir_version: "1.14.5" +======= + - erlang_version: "26.1" + elixir_version: "1.15.2" +>>>>>>> 75eb0621fc (Use OTP 26.1 as OTP 26 in CI) timeout-minutes: 120 steps: - name: CHECKOUT REPOSITORY diff --git a/.github/workflows/update-otp-patches.yaml b/.github/workflows/update-otp-patches.yaml index cc0a3d25b03..01ee4fa013c 100644 --- a/.github/workflows/update-otp-patches.yaml +++ b/.github/workflows/update-otp-patches.yaml @@ -17,7 +17,7 @@ jobs: - "25.1" - "25.2" - "25.3" - - "26.0" + - "26.1" include: - erlang_version: "24.3" name: '24' @@ -48,8 +48,8 @@ jobs: backport-v3.12.x backport-v3.11.x backport-v3.10.x - - erlang_version: "26.0" - name: '26' + - erlang_version: "26.1" + name: '26_1' branch: main labels: | backport-v3.12.x diff --git a/MODULE.bazel b/MODULE.bazel index 9602262a844..4e277690b52 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -95,9 +95,9 @@ erlang_config.internal_erlang_from_github_release( ) erlang_config.internal_erlang_from_github_release( - name = "26", - sha256 = "47853ea9230643a0a31004433f07a71c1b92d6e0094534f629e3b75dbc62f193", - version = "26.0.2", + name = "26_1", + sha256 = "f914ddea79019ab2533911cdd4f91653726ac9b0561b3ec57aa6ecbcc3df3f55", + version = "26.1", ) erlang_config.internal_erlang_from_http_archive( @@ -151,8 +151,8 @@ register_toolchains( "@erlang_config//25_2:toolchain_major_minor", "@erlang_config//25_3:toolchain_major", "@erlang_config//25_3:toolchain_major_minor", - "@erlang_config//26:toolchain_major", - "@erlang_config//26:toolchain_major_minor", + "@erlang_config//26_1:toolchain_major", + "@erlang_config//26_1:toolchain_major_minor", "@erlang_config//git_master:toolchain_major", "@erlang_config//git_master:toolchain_major_minor", "@elixir_config//external:toolchain", diff --git a/WORKSPACE b/WORKSPACE index 97bdb9662da..684f8dcca8b 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -106,10 +106,10 @@ http_file( ) http_file( - name = "otp_src_26", - downloaded_file_path = "OTP-26.0.2.tar.gz", - sha256 = "4def5ed5e49815fb02fceae8a66e94abc1049f5de30f97d9ad12fdf3293a2470", - urls = ["https://github.com/erlang/otp/archive/OTP-26.0.2.tar.gz"], + name = "otp_src_26_1", + downloaded_file_path = "OTP-26.1.tar.gz", + sha256 = "09864524516bd26be040ae9ee09d70ce38ded2bcec041bc36081313b5031dfe8", + urls = ["https://github.com/erlang/otp/archive/OTP-26.1.tar.gz"], ) new_git_repository( diff --git a/bazel/platforms/BUILD.bazel b/bazel/platforms/BUILD.bazel index d76ca5cc7c5..9985275396b 100644 --- a/bazel/platforms/BUILD.bazel +++ b/bazel/platforms/BUILD.bazel @@ -57,9 +57,9 @@ platform( ) platform( - name = "erlang_linux_26_platform", + name = "erlang_linux_26_1_platform", constraint_values = [ - "@erlang_config//:erlang_26", + "@erlang_config//:erlang_26_1", "@elixir_config//:elixir_1_15", ], parents = ["@rbe//config:platform"], diff --git a/packaging/docker-image/BUILD.bazel b/packaging/docker-image/BUILD.bazel index 6ef1c33dc02..560ce1c758a 100644 --- a/packaging/docker-image/BUILD.bazel +++ b/packaging/docker-image/BUILD.bazel @@ -141,7 +141,7 @@ container_image( "@erlang_config//:erlang_25_1": ["@otp_src_25_1//file"], "@erlang_config//:erlang_25_2": ["@otp_src_25_2//file"], "@erlang_config//:erlang_25_3": ["@otp_src_25_3//file"], - "@erlang_config//:erlang_26_0": ["@otp_src_26//file"], + "@erlang_config//:erlang_26_1": ["@otp_src_26_1//file"], }), ) From 862b658fb52dd3c2294580067cca801b6dd66363 Mon Sep 17 00:00:00 2001 From: Michael Klishin Date: Wed, 20 Sep 2023 16:12:13 -0400 Subject: [PATCH 2/2] Resolve a conflict (#9491) --- ...d-system-equivalence-release-branches.yaml | 21 +++---------------- .github/workflows/test-windows.yaml | 7 +------ 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/.github/workflows/check-build-system-equivalence-release-branches.yaml b/.github/workflows/check-build-system-equivalence-release-branches.yaml index 843720b8d2f..f98833aab83 100644 --- a/.github/workflows/check-build-system-equivalence-release-branches.yaml +++ b/.github/workflows/check-build-system-equivalence-release-branches.yaml @@ -6,38 +6,23 @@ jobs: check-main: uses: ./.github/workflows/check-build-system-equivalence.yaml with: -<<<<<<< HEAD - ref: main - erlang_version: 26.0 -======= - ref: refs/heads/main + ref: refs/heads/main erlang_version: 26.1 ->>>>>>> 75eb0621fc (Use OTP 26.1 as OTP 26 in CI) elixir_version: 1.15 project_version: 3.13.0 check-v3_12_x: uses: ./.github/workflows/check-build-system-equivalence.yaml with: -<<<<<<< HEAD - ref: v3.12.x - erlang_version: 26.0 -======= - ref: refs/heads/v3.12.x + ref: refs/heads/v3.12.x erlang_version: 26.1 ->>>>>>> 75eb0621fc (Use OTP 26.1 as OTP 26 in CI) elixir_version: 1.15 project_version: 3.12.0 check-v3_11_x: uses: ./.github/workflows/check-build-system-equivalence.yaml with: -<<<<<<< HEAD - ref: v3.11.x - erlang_version: 26.0 -======= - ref: refs/heads/v3.11.x + ref: refs/heads/v3.11.x erlang_version: 26.1 ->>>>>>> 75eb0621fc (Use OTP 26.1 as OTP 26 in CI) elixir_version: 1.15 project_version: 3.11.0 diff --git a/.github/workflows/test-windows.yaml b/.github/workflows/test-windows.yaml index 3d4936f329b..0451ff47809 100644 --- a/.github/workflows/test-windows.yaml +++ b/.github/workflows/test-windows.yaml @@ -11,13 +11,8 @@ jobs: fail-fast: false matrix: include: -<<<<<<< HEAD - - erlang_version: "26.0" - elixir_version: "1.14.5" -======= - - erlang_version: "26.1" + - erlang_version: "26.1" elixir_version: "1.15.2" ->>>>>>> 75eb0621fc (Use OTP 26.1 as OTP 26 in CI) timeout-minutes: 120 steps: - name: CHECKOUT REPOSITORY