Merge branch '6.2.x' into 6.3.x

This commit is contained in:
Marcus Hert Da Coregio 2024-06-28 09:32:37 -03:00
commit 675eda1945
2 changed files with 4 additions and 1 deletions

View File

@ -21,7 +21,7 @@ jobs:
java-version: '17'
distribution: 'temurin'
- name: Build with Gradle
run: ./gradlew clean build --continue
run: ./gradlew clean build -PskipCheckExpectedBranchVersion --continue
generate-docs:
name: Generate Docs
runs-on: ubuntu-latest

View File

@ -45,6 +45,9 @@ public class CheckExpectedBranchVersionPlugin implements Plugin<Project> {
@TaskAction
public void run() throws IOException {
Project project = getProject();
if (project.hasProperty("skipCheckExpectedBranchVersion")) {
return;
}
String version = (String) project.getVersion();
String branchVersion = getBranchVersion(project);
if (!branchVersion.matches("^[0-9]+\\.[0-9]+\\.x$")) {