Allow excluding xmlschema from the configuration, and use that

in automation. Xmlschema is not ready and the tests still fail.
pdvrieze · Jun 19, 2024 · e68839c · e68839c
1 parent 7952fdf
commit e68839c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 13 deletions.
diff --git a/.github/workflows/deploy-to-packages.yml b/.github/workflows/deploy-to-packages.yml
@@ -52,11 +52,11 @@ jobs:
                 uses: gradle/actions/setup-gradle@v3.3.2
             -   name: Check (macos / windows)
                 if: matrix.os != 'ubuntu-latest'
-                run: ./gradlew nativeTest --stacktrace
+                run: ./gradlew -PexcludeSchema nativeTest --stacktrace
                 shell: bash
             -   name: Check (ubuntu)
                 if: matrix.os == 'ubuntu-latest'
-                run: ./gradlew check --stacktrace
+                run: ./gradlew -PexcludeSchema check --stacktrace
                 shell: bash
             -   name: Store reports
                 if: failure()
@@ -68,7 +68,7 @@ jobs:
                         **/build/test-results/
             -   name: Upload (macOs)
                 if: matrix.os == 'macOs-latest'
-                run: ./gradlew publish -Pxmlutil.repositoryId='${{ needs.create-staging-repository.outputs.repository_id }}' -Possrh.username='${{ secrets.OSSRH_USERNAME }}' -Possrh.password='${{ secrets.OSSRH_PASSWORD }}' -Pnative.deploy=all --stacktrace
+                run: ./gradlew -PexcludeSchema publish -Pxmlutil.repositoryId='${{ needs.create-staging-repository.outputs.repository_id }}' -Possrh.username='${{ secrets.OSSRH_USERNAME }}' -Possrh.password='${{ secrets.OSSRH_PASSWORD }}' -Pnative.deploy=all --stacktrace
                 shell: bash
 
     drop-on-failure:

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -10,23 +10,26 @@ trigger:
 pool:
   vmImage: 'ubuntu-latest'
 
-strategy:
-  matrix:
-#    jdk11:
-#      jdk_version: "1.11"
-    jdk17:
-        jdk_version: "1.17"
-  maxParallel: 2
+#strategy:
+#  matrix:
+##    jdk11:
+##      jdk_version: "1.11"
+#    jdk17:
+#        jdk_version: "1.17"
+#  maxParallel: 2
 
 steps:
-- task: Gradle@2
+- checkout: self
+  submodules: true
+- task: Gradle@3
   inputs:
     workingDirectory: ''
     gradleWrapperFile: 'gradlew'
     gradleOptions: '-Xmx2048m'
     javaHomeOption: 'JDKVersion'
-    jdkVersionOption: $(jdk_version)
+    jdkVersionOption: "1.17"
     jdkArchitectureOption: 'x64'
     publishJUnitResults: true
     testResultsFiles: '**/TEST-*.xml'
     tasks: 'build'
+    options: '-PexcludeSchema'
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -49,6 +49,10 @@ plugins {
     id ("com.gradle.enterprise") version "3.1.1"
 }
 
+val includeSchema = providers.gradleProperty("excludeSchema").map {
+    it.lowercase() == "false"
+}.getOrElse(true)
+
 rootProject.name = "xmlutil"
 
 include(":serialutil")
@@ -61,7 +65,9 @@ include(":serialization")
 include(":xmlserializable")
 include(":testutil")
 include(":examples")
-include(":xmlschema")
+if (includeSchema) {
+    include(":xmlschema")
+}
 
 project(":core").projectDir = file("core/base")
 project(":coreJdk").projectDir = file("core/jdk")