Use OTP 26.1 as OTP 26 in CI

This commit is contained in:
Rin Kuryloski 2023-09-20 12:35:41 +02:00
parent b1afc92a62
commit 75eb0621fc
12 changed files with 31 additions and 28 deletions

View File

@ -67,7 +67,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

View File

@ -7,7 +7,7 @@ jobs:
uses: ./.github/workflows/check-build-system-equivalence.yaml
with:
ref: refs/heads/main
erlang_version: 26.0
erlang_version: 26.1
elixir_version: 1.15
project_version: 3.13.0
@ -15,7 +15,7 @@ jobs:
uses: ./.github/workflows/check-build-system-equivalence.yaml
with:
ref: refs/heads/v3.12.x
erlang_version: 26.0
erlang_version: 26.1
elixir_version: 1.15
project_version: 3.12.0
@ -23,6 +23,6 @@ jobs:
uses: ./.github/workflows/check-build-system-equivalence.yaml
with:
ref: refs/heads/v3.11.x
erlang_version: 26.0
erlang_version: 26.1
elixir_version: 1.15
project_version: 3.11.0

View File

@ -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

View File

@ -36,7 +36,7 @@ jobs:
- image_tag_suffix: otp-min-bazel
otp_version_id: 25_3
- 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

View File

@ -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

View File

@ -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

View File

@ -11,7 +11,7 @@ jobs:
fail-fast: false
matrix:
include:
- erlang_version: "26.0"
- erlang_version: "26.1"
elixir_version: "1.15.2"
timeout-minutes: 120
steps:

View File

@ -17,7 +17,7 @@ jobs:
- "25.1"
- "25.2"
- "25.3"
- "26.0"
- "26.1"
include:
- erlang_version: "24.3"
name: '24'
@ -50,8 +50,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

View File

@ -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",

View File

@ -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(

View File

@ -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"],

View File

@ -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"],
}),
)