Skip to content

Commit

Permalink
Merge branch 'refs/heads/dev'
Browse files Browse the repository at this point in the history
# Conflicts:
#	Changelog.md
#	gradle/libs.versions.toml
  • Loading branch information
pdvrieze committed Jul 21, 2024
2 parents 805e46d + bd1b782 commit 6786a6f
Show file tree
Hide file tree
Showing 496 changed files with 53,697 additions and 2,172 deletions.
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@ ij_wrap_on_typing = false
[{*.markdown,*.md}]
max_line_length = 80
ij_visual_guides = 70, 80

[xmlschema/src/jvmTest/resources/override.*]
indent_size = 2
6 changes: 3 additions & 3 deletions .github/workflows/deploy-to-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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:
Expand Down
6 changes: 5 additions & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
[submodule "pages"]
path = pages
url = git@github.com:pdvrieze/xmlutil.git
url = ./
branch = pages

[submodule "xsdtests"]
path = schemaTests/src/jvmMain/resources/xsts
url = https://github.com/w3c/xsdtests.git
1 change: 1 addition & 0 deletions .idea/copyright/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

56 changes: 40 additions & 16 deletions .idea/inspectionProfiles/Deprecation_only.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 6786a6f

Please sign in to comment.