From ce82e816e9f3de11743773f2d4cf753bcd0738d4 Mon Sep 17 00:00:00 2001
From: Fran Garcia-Linares <14157-fjgarlin@users.noreply.drupalcode.org>
Date: Wed, 18 Dec 2024 09:18:34 +0000
Subject: [PATCH] Issue #3493016 by fjgarlin, hestenet, catch, jonathan1055,
alexpott: Update core branches ready for Drupal 11.1.0/10.4.0
---
includes/include.drupalci.hidden-variables.yml | 8 ++++----
scripts/check-versions.php | 10 +++++-----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/includes/include.drupalci.hidden-variables.yml b/includes/include.drupalci.hidden-variables.yml
index ed2b11f4..e29cf936 100644
--- a/includes/include.drupalci.hidden-variables.yml
+++ b/includes/include.drupalci.hidden-variables.yml
@@ -13,16 +13,16 @@ variables:
################
# The most recent, stable version of Drupal.
- CORE_STABLE: '11.0.9'
+ CORE_STABLE: '11.1.0'
# The most recent security release in the latest major version of Drupal.
CORE_SECURITY: '11.0.8'
# Development branch for patch level development/bugfixes.
- CORE_SUPPORTED: '11.0.x-dev'
+ CORE_SUPPORTED: '11.1.x-dev'
# The most recent security release in the previous minor of the latest major version of Drupal.
- CORE_SECURITY_PREVIOUS_MINOR: ''
+ CORE_SECURITY_PREVIOUS_MINOR: '11.0.8'
# The most recent, stable previous major version of Drupal.
CORE_PREVIOUS_STABLE: '10.3.10'
@@ -34,7 +34,7 @@ variables:
CORE_MINOR: '11.x-dev'
# Once the current minor-dev branch enters a beta phase, this is the dev branch for the *next* minor version.
- CORE_NEXT_MINOR: '11.1.x-dev'
+ CORE_NEXT_MINOR: '11.x-dev'
# Development branch for next major version of Drupal.
CORE_MAJOR_DEVELOPMENT: ''
diff --git a/scripts/check-versions.php b/scripts/check-versions.php
index bc9250c2..b18e65e6 100644
--- a/scripts/check-versions.php
+++ b/scripts/check-versions.php
@@ -23,7 +23,7 @@ const NEXT_D7 = '7.104';
const NEXT_MAJOR_DEV = '12.x';
const NEXT_MAJOR_FIRST_STABLE_TAG = '12.0.0';
const NEXT_MINOR_DEV = '11.2.x';
-const NEXT_MINOR_STABLE = '11.1.0';
+const NEXT_MINOR_STABLE = '11.2.0';
/**
* Gather releases and store them in arrays.
@@ -158,11 +158,11 @@ function check_core_security($security_releases, $stable_tags) {
echo "- [ERROR] CORE_STABLE (" . getenv('CORE_STABLE') . ") and CORE_SECURITY (" . getenv('CORE_SECURITY') . ") have different major:minor versions." . PHP_EOL . ' ' . PHP_EOL;
return 1;
}
- }
- if (getenv('CORE_SECURITY') == getenv('CORE_SECURITY_PREVIOUS_MINOR')) {
- echo "- [ERROR] CORE_SECURITY (" . getenv('CORE_SECURITY') . ") should be different from CORE_SECURITY_PREVIOUS_MINOR (" . getenv('CORE_SECURITY_PREVIOUS_MINOR') . ")" . PHP_EOL . ' ' . PHP_EOL;
- return 1;
+ if (getenv('CORE_SECURITY') == getenv('CORE_SECURITY_PREVIOUS_MINOR')) {
+ echo "- [ERROR] CORE_SECURITY (" . getenv('CORE_SECURITY') . ") should be different from CORE_SECURITY_PREVIOUS_MINOR (" . getenv('CORE_SECURITY_PREVIOUS_MINOR') . ")" . PHP_EOL . ' ' . PHP_EOL;
+ return 1;
+ }
}
return 0;
--
GitLab