Skip to content

Commit

Permalink
All Tests working
Browse files Browse the repository at this point in the history
  • Loading branch information
tschuehly committed Sep 4, 2023
1 parent 0a63144 commit cfbf9fd
Show file tree
Hide file tree
Showing 29 changed files with 174 additions and 482 deletions.
20 changes: 11 additions & 9 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,10 @@ jobs:
with:
java-version: '17'
distribution: 'temurin'
- name: Run chmod to make gradlew executable
- name: make gradle executable
run: chmod +x ./gradlew
- name: publish local
run: |
./gradlew :core:publishToMavenLocal
./gradlew :thymeleaf:publishToMavenLocal
./gradlew :jte:publishToMavenLocal
- name: publishToMavenLocal
run: ./gradlew :core:publishToMavenLocal :thymeleaf:publishToMavenLocal :jte:publishToMavenLocal :jte-compiler:publishToMavenLocal
- name: run thymeleaf kotlin tests
run: |
cd ./examples/thymeleaf-kotlin-example
Expand All @@ -34,11 +31,16 @@ jobs:
cd ./examples/thymeleaf-java-example
chmod +x ./mvnw
./mvnw test
- name: run jte kotlin tests
- name: run kte kotlin tests
run: |
cd ./examples/jte-example
cd ./examples/kte-example
chmod +x ./gradlew
./gradlew test
- name: run jte java tests
run: |
cd ./examples/jte-example
chmod +x ./mvnw
./mvnw test
publish:
needs: test
runs-on: ubuntu-latest
Expand Down Expand Up @@ -83,4 +85,4 @@ jobs:
JRELEASER_GPG_SECRET_KEY: ${{ secrets.JRELEASER_GPG_SECRET_KEY }}
JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.JRELEASER_GPG_PUBLIC_KEY }}
JRELEASER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: ./gradlew :core:jreleaserDeploy -DaltDeploymentRepository=local::file:./core/build/staging-deploy --stacktrace
run: ./gradlew :core:jreleaserDeploy -DaltDeploymentRepository=local::file:./core/build/staging-deploy --stacktrace
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ annotation class DeleteViewAction(

object ViewActionConstant {
val attributeName = "view:action"
val nestedViewComponentAttributeName = "data-nested-view-component"

}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class ViewComponentParser(
val resourceDirPath = getResourceDirPath(rootDir, packagePath)
val resourceHtmlFile = getResourceFile(resourceDirPath)
resourceHtmlFile.writeAll(parsedHtml)
if(resourceHtmlFile.extension == "jte" || resourceHtmlFile.extension == "kte") {
if (resourceHtmlFile.extension == "jte" || resourceHtmlFile.extension == "kte") {
compileJte(rootDir, isLiveReload, resourceDirPath, resourceHtmlFile, packagePath)
}
}
Expand Down
36 changes: 0 additions & 36 deletions examples/jte-example/build.gradle.kts

This file was deleted.

248 changes: 0 additions & 248 deletions examples/jte-example/gradlew

This file was deleted.

Loading

0 comments on commit cfbf9fd

Please sign in to comment.