root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Adopt OTP 25.2

This commit is contained in:
Michal Kuratczyk 2022-12-14 10:29:17 +01:00
parent 27653f5130
commit d78b8b3a2a
No known key found for this signature in database
11 changed files with 49 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.bazelrc
View File

@ -43,7 +43,7 @@ build:rbe-24 --config=rbe
build:rbe-24 --platforms=//bazel/platforms:erlang_linux_24_platform
build:rbe-25 --config=rbe
build:rbe-25 --platforms=//bazel/platforms:erlang_linux_25_1_platform
build:rbe-25 --platforms=//bazel/platforms:erlang_linux_25_2_platform
build:rbe-25_0 --config=rbe
build:rbe-25_0 --platforms=//bazel/platforms:erlang_linux_25_0_platform
@ -51,6 +51,9 @@ build:rbe-25_0 --platforms=//bazel/platforms:erlang_linux_25_0_platform
build:rbe-25_1 --config=rbe
build:rbe-25_1 --platforms=//bazel/platforms:erlang_linux_25_1_platform
build:rbe-25_2 --config=rbe
build:rbe-25_2 --platforms=//bazel/platforms:erlang_linux_25_2_platform
# no-op config so that --config=local does not error
build:local --color=auto

2
.github/workflows/oci.yaml vendored
View File

@ -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: 25_1
otp_version_id: 25_2
steps:
- name: Checkout
uses: actions/checkout@v3

4
.github/workflows/test-mixed-versions.yaml vendored
View File

@ -126,7 +126,7 @@ jobs:
fail-fast: false
matrix:
otp_version_id:
- "25_1"
- "25_2"
timeout-minutes: 120
steps:
- name: CHECKOUT REPOSITORY
@ -168,7 +168,7 @@ jobs:
strategy:
matrix:
include:
- erlang_version: "25.1"
- erlang_version: "25.2"
elixir_version: 1.14.0
timeout-minutes: 60
steps:

4
.github/workflows/test-selenium.yaml vendored
View File

@ -27,11 +27,11 @@ jobs:
fail-fast: false
matrix:
erlang_version:
- "25.1"
- "25.2"
browser:
- chrome
include:
- erlang_version: "25.1"
- erlang_version: "25.2"
elixir_version: 1.13.4
env:
SELENIUM_DIR: deps/rabbitmq_management/selenium

2
.github/workflows/test-windows.yaml vendored
View File

@ -14,7 +14,7 @@ jobs:
fail-fast: false
matrix:
include:
- erlang_version: "25.1"
- erlang_version: "25.2"
elixir_version: 1.14.0
timeout-minutes: 120
steps:

4
.github/workflows/test.yaml vendored
View File

@ -35,7 +35,7 @@ jobs:
matrix:
otp_version_id:
- 25_0
- 25_1
- 25_2
timeout-minutes: 120
steps:
- name: CHECKOUT REPOSITORY
@ -81,7 +81,7 @@ jobs:
include:
- erlang_version: "25.0"
elixir_version: 1.14.0
- erlang_version: "25.1"
- erlang_version: "25.2"
elixir_version: 1.14.0
timeout-minutes: 60
steps:

7
.github/workflows/update-otp-patches.yaml vendored
View File

@ -15,6 +15,7 @@ jobs:
- "24.3"
- "25.0"
- "25.1"
- "25.2"
include:
- erlang_version: "24.3"
name: '24'
@ -32,6 +33,12 @@ jobs:
labels: |
backport-v3.11.x
backport-v3.10.x
- erlang_version: "25.2"
name: '25_2'
branch: main
labels: |
backport-v3.11.x
backport-v3.10.x
timeout-minutes: 10
steps:
- name: CHECKOUT REPOSITORY

8
MODULE.bazel
View File

@ -51,6 +51,12 @@ erlang_config.internal_erlang_from_github_release(
version = "25.1.2",
)
erlang_config.internal_erlang_from_github_release(
name = "25_2",
sha256 = "aee1ef294ee048c976d6a126a430367076354f484f557eacaf08bf086cb1314d",
version = "25.2",
)
erlang_config.internal_erlang_from_http_archive(
name = "git_master",
strip_prefix = "otp-master",
@ -92,6 +98,8 @@ register_toolchains(
"@erlang_config//25_0:toolchain2",
"@erlang_config//25_1:toolchain",
"@erlang_config//25_1:toolchain2",
"@erlang_config//25_2:toolchain",
"@erlang_config//25_2:toolchain2",
"@erlang_config//git_master:toolchain",
"@erlang_config//git_master:toolchain2",
"@elixir_config//external:toolchain",

12
WORKSPACE
View File

@ -83,6 +83,13 @@ http_file(
urls = ["https://github.com/erlang/otp/archive/OTP-25.1.2.tar.gz"],
)
http_file(
name = "otp_src_25_2",
downloaded_file_path = "OTP-25.2.tar.gz",
sha256 = "d33a988f39e534aff67799c5b9635612858459c9d8890772546d71ea38de897a",
urls = ["https://github.com/erlang/otp/archive/OTP-25.2.tar.gz"],
)
http_archive(
name = "io_buildbuddy_buildbuddy_toolchain",
sha256 = "a2a5cccec251211e2221b1587af2ce43c36d32a42f5d881737db3b546a536510",
@ -140,6 +147,11 @@ erlang_config(
sha256 = "5442dea694e7555d479d80bc81f1428020639c258f8e40b2052732d1cc95cca5",
version = "25.1.2",
),
internal_erlang_from_github_release(
name = "25_2",
sha256 = "aee1ef294ee048c976d6a126a430367076354f484f557eacaf08bf086cb1314d",
version = "25.2",
),
internal_erlang_from_http_archive(
name = "git_master",
strip_prefix = "otp-master",

9
bazel/platforms/BUILD.bazel
View File

@ -38,6 +38,15 @@ platform(
parents = ["@rbe//config:platform"],
)
platform(
name = "erlang_linux_25_2_platform",
constraint_values = [
"@erlang_config//:erlang_25_2",
"@elixir_config//:elixir_1_14",
],
parents = ["@rbe//config:platform"],
)
platform(
name = "erlang_linux_git_master_platform",
constraint_values = [

1
packaging/docker-image/BUILD.bazel
View File

@ -123,6 +123,7 @@ container_image(
"@erlang_config//:erlang_24": ["@otp_src_24//file"],
"@erlang_config//:erlang_25_0": ["@otp_src_25_0//file"],
"@erlang_config//:erlang_25_1": ["@otp_src_25_1//file"],
"@erlang_config//:erlang_25_2": ["@otp_src_25_2//file"],
}),
)