Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@ jobs:
check-main:
uses: ./.github/workflows/check-build-system-equivalence.yaml
with:
ref: main
erlang_version: 26.0
ref: refs/heads/main
erlang_version: 26.1
elixir_version: 1.15
project_version: 3.13.0

check-v3_12_x:
uses: ./.github/workflows/check-build-system-equivalence.yaml
with:
ref: v3.12.x
erlang_version: 26.0
ref: refs/heads/v3.12.x
erlang_version: 26.1
elixir_version: 1.15
project_version: 3.12.0

check-v3_11_x:
uses: ./.github/workflows/check-build-system-equivalence.yaml
with:
ref: v3.11.x
erlang_version: 26.0
ref: refs/heads/v3.11.x
erlang_version: 26.1
elixir_version: 1.15
project_version: 3.11.0
2 changes: 1 addition & 1 deletion .github/workflows/check-build-system-equivalence.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/oci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-authnz.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-selenium.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
fail-fast: false
matrix:
include:
- erlang_version: "26.0"
elixir_version: "1.14.5"
- erlang_version: "26.1"
elixir_version: "1.15.2"
timeout-minutes: 120
steps:
- name: CHECKOUT REPOSITORY
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/update-otp-patches.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- "25.1"
- "25.2"
- "25.3"
- "26.0"
- "26.1"
include:
- erlang_version: "24.3"
name: '24'
Expand Down Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions bazel/platforms/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down
2 changes: 1 addition & 1 deletion packaging/docker-image/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
}),
)

Expand Down