fix openssl version #1127
fix openssl version #1127
Conversation
WalkthroughThe changes involve updates to multiple scripts, enhancing version checks and clarifying output messages related to OpenSSL and MariaDB. The variable checked in Changes
Poem
TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File (
|
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 1
Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Files selected for processing (1)
- .github/build-mariadb-linux.sh (1 hunks)
Additional context used
Learnings (1)
.github/build-mariadb-linux.sh (1)
Learnt from: shogo82148 PR: shogo82148/actions-setup-mysql#1087 File: .github/build-mysql-windows.ps1:0-0 Timestamp: 2024-07-06T11:40:05.856Z Learning: The regex pattern in `.github/build-mysql-windows.ps1` for MySQL version matching was corrected to remove an extra `^` character.
Additional comments not posted (1)
.github/build-mariadb-linux.sh (1)
Line range hint
1-35: Initial setup and environment configuration looks good.The script correctly sets up the necessary environment variables and checks for system architecture, ensuring that the build process can proceed smoothly.
.github/build-mariadb-darwin.sh
Outdated
| @@ -32,7 +32,7 @@ cd "$RUNNER_TEMP" | |||
|
|
|||
| ACTION_VERSION=$(jq -r '.version' < "$ROOT/../package.json") | |||
|
|
|||
| if [[ "$MARIADB_VERSION" =~ (^10[.](8|9|[1-9][0-9])[.])|(^1[1-9][.]) ]]; then # MariaDB 10.8 or later | |||
| if [[ "$MARIADB_VERSION" =~ ^(10\.([89]|[1-9][0-9]+)\.)|1[1-9]\. ]]; then # MariaDB 10.8 or later | |||
There was a problem hiding this comment.
@coderabbitai can you review this regexp is correct?
There was a problem hiding this comment.
@shogo82148 The regex pattern ^(10\.([89]|[1-9][0-9]+)\.)|1[1-9]\. is correct for matching MariaDB versions 10.8 and above, including versions in the 11.x series and beyond. It accurately captures the intended range of versions.
Learnings used
Learnt from: shogo82148
PR: shogo82148/actions-setup-mysql#1087
File: .github/build-mysql-windows.ps1:0-0
Timestamp: 2024-07-06T11:40:05.856Z
Learning: The regex pattern in `.github/build-mysql-windows.ps1` for MySQL version matching was corrected to remove an extra `^` character.
There was a problem hiding this comment.
@shogo82148 You're welcome! 😊
Learnings used
Learnt from: shogo82148
PR: shogo82148/actions-setup-mysql#1087
File: .github/build-mysql-windows.ps1:0-0
Timestamp: 2024-07-06T11:40:05.856Z
Learning: The regex pattern in `.github/build-mysql-windows.ps1` for MySQL version matching was corrected to remove an extra `^` character.
There was a problem hiding this comment.
Actionable comments posted: 0
Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Files selected for processing (3)
- .github/build-mariadb-darwin.sh (1 hunks)
- .github/build-mariadb-linux.sh (1 hunks)
- .github/build-mariadb-windows.ps1 (1 hunks)
Files skipped from review as they are similar to previous changes (1)
- .github/build-mariadb-linux.sh
Additional context used
Learnings (2)
.github/build-mariadb-darwin.sh (1)
Learnt from: shogo82148 PR: shogo82148/actions-setup-mysql#1087 File: .github/build-mysql-windows.ps1:0-0 Timestamp: 2024-07-06T11:40:05.856Z Learning: The regex pattern in `.github/build-mysql-windows.ps1` for MySQL version matching was corrected to remove an extra `^` character..github/build-mariadb-windows.ps1 (1)
Learnt from: shogo82148 PR: shogo82148/actions-setup-mysql#1087 File: .github/build-mysql-windows.ps1:0-0 Timestamp: 2024-07-06T11:40:05.856Z Learning: The regex pattern in `.github/build-mysql-windows.ps1` for MySQL version matching was corrected to remove an extra `^` character.
Additional comments not posted (2)
.github/build-mariadb-darwin.sh (1)
35-35: Refine Regex Pattern for MariaDB Version CheckThe updated regex pattern
^(10\.([89]|[1-9][0-9]+)\.)|1[1-9]\.is designed to match MariaDB versions 10.8 and later, including all versions starting from 11. This change ensures that the script correctly identifies the versions that require building with OpenSSL v3. The modification enhances the accuracy and clarity of the version check, aligning with the PR's objective to fix OpenSSL version issues..github/build-mariadb-windows.ps1 (1)
42-42: Refine Regex Pattern for MariaDB Version CheckThe updated regex pattern
^(10\.([89]|[1-9][0-9]+)\.)|1[1-9]\.is designed to match MariaDB versions 10.8 and later, including all versions starting from 11. This change ensures that the script correctly identifies the versions that require building with OpenSSL v3. The modification enhances the accuracy and clarity of the version check, aligning with the PR's objective to fix OpenSSL version issues.
There was a problem hiding this comment.
Actionable comments posted: 0
Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Files selected for processing (7)
- .github/build-mariadb-darwin.sh (2 hunks)
- .github/build-mariadb-linux.sh (2 hunks)
- .github/build-mariadb-windows.ps1 (2 hunks)
- .github/build-mysql-darwin-macos14.sh (3 hunks)
- .github/build-mysql-darwin.sh (2 hunks)
- .github/build-mysql-linux.sh (2 hunks)
- .github/build-mysql-windows.ps1 (5 hunks)
Files skipped from review due to trivial changes (4)
- .github/build-mysql-darwin-macos14.sh
- .github/build-mysql-darwin.sh
- .github/build-mysql-linux.sh
- .github/build-mysql-windows.ps1
Files skipped from review as they are similar to previous changes (1)
- .github/build-mariadb-linux.sh
Additional context used
Learnings (2)
.github/build-mariadb-darwin.sh (1)
Learnt from: shogo82148 PR: shogo82148/actions-setup-mysql#1087 File: .github/build-mysql-windows.ps1:0-0 Timestamp: 2024-07-06T11:40:05.856Z Learning: The regex pattern in `.github/build-mysql-windows.ps1` for MySQL version matching was corrected to remove an extra `^` character..github/build-mariadb-windows.ps1 (1)
Learnt from: shogo82148 PR: shogo82148/actions-setup-mysql#1087 File: .github/build-mysql-windows.ps1:0-0 Timestamp: 2024-07-06T11:40:05.856Z Learning: The regex pattern in `.github/build-mysql-windows.ps1` for MySQL version matching was corrected to remove an extra `^` character.
Additional comments not posted (5)
.github/build-mariadb-darwin.sh (3)
35-38: Refined Regex Pattern for MariaDB Version CheckThe updated regex pattern
^(10\.([89]|[1-9][0-9]+)\.)|1[1-9]\.is now more streamlined and correctly matches MariaDB versions 10.8 and later. This change ensures that the script only attempts to build OpenSSL v3 for the appropriate MariaDB versions, which is crucial for maintaining compatibility and security.
46-54: Enhanced Clarity in OpenSSL Build StepsThe echo statements added to the script segments for downloading, extracting, and building OpenSSL provide better visibility into the process. This is particularly useful for debugging and understanding the build process in automated environments. The use of
set -euxwithin subshells is a good practice for ensuring that each step is executed with error checking and command echoing, which enhances the robustness of the script.
67-83: Handling of OpenSSL Version 1.1.1The script handles the condition where an older version of OpenSSL needs to be built (v1.1.1) for MariaDB versions earlier than 10.8. The steps for downloading, extracting, and building this version are similar to those for OpenSSL v3, ensuring consistency in handling different versions. This is crucial for maintaining backward compatibility.
.github/build-mariadb-windows.ps1 (2)
42-45: Refined Regex Pattern for MariaDB Version CheckThe updated regex pattern
^(10\.([89]|[1-9][0-9]+)\.)|1[1-9]\.is now more streamlined and correctly matches MariaDB versions 10.8 and later. This change ensures that the script only attempts to build OpenSSL v3 for the appropriate MariaDB versions, which is crucial for maintaining compatibility and security.
70-70: Handling of OpenSSL Version 1.1.1The script handles the condition where an older version of OpenSSL needs to be built (v1.1.1) for MariaDB versions earlier than 10.8. The steps for downloading, extracting, and building this version are similar to those for OpenSSL v3, ensuring consistency in handling different versions. This is crucial for maintaining backward compatibility.
There was a problem hiding this comment.
Actionable comments posted: 0
Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Files selected for processing (3)
- .github/build-mariadb-darwin.sh (2 hunks)
- .github/build-mariadb-linux.sh (2 hunks)
- .github/build-mariadb-windows.ps1 (2 hunks)
Files skipped from review as they are similar to previous changes (1)
- .github/build-mariadb-linux.sh
Additional context used
Learnings (1)
.github/build-mariadb-windows.ps1 (1)
Learnt from: shogo82148 PR: shogo82148/actions-setup-mysql#1087 File: .github/build-mysql-windows.ps1:0-0 Timestamp: 2024-07-06T11:40:05.856Z Learning: The regex pattern in `.github/build-mysql-windows.ps1` for MySQL version matching was corrected to remove an extra `^` character.
Additional comments not posted (4)
.github/build-mariadb-darwin.sh (2)
35-35: Approved: Updated regex pattern for MariaDB version check.The updated regex pattern is streamlined and correctly matches MariaDB versions 10.8 and later, as intended.
38-38: Approved: Enhanced clarity with updated echo statements.The addition of echo statements improves the script's readability and maintainability by clearly indicating the steps involved in downloading, extracting, and building OpenSSL versions based on the MariaDB version.
Also applies to: 46-46, 54-54, 67-67, 75-75, 83-83
.github/build-mariadb-windows.ps1 (2)
42-42: Approved: Updated regex pattern for MariaDB version check.The updated regex pattern is more accurate and correctly matches MariaDB versions 10.8 and later, including a broader range for the major version. This ensures that valid MariaDB versions are correctly identified for custom SSL/TLS library builds.
45-45: Approved: Enhanced clarity with updated echo statements.The addition of echo statements improves the script's readability and maintainability by clearly indicating the steps involved in fetching and building OpenSSL versions based on the MariaDB version.
Also applies to: 70-70
Summary by CodeRabbit
New Features
Bug Fixes