Skip to content

Commit

Permalink
Fix gradle build so that ui is really, really copied to the resource dir
Browse files Browse the repository at this point in the history
  • Loading branch information
holomekc committed Nov 30, 2023
1 parent cbe0f89 commit 511f475
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/create-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,13 @@ jobs:
# latest
docker container run -d --name test -p 8080:8080 ${{ matrix.versions.IMAGES[0] }}
timeout 10 bash -c 'while ! curl --fail http://localhost:8080/__admin/; do sleep 1; done'
timeout 10 bash -c 'while ! curl --fail http://localhost:8080/__admin/webapp; do sleep 1; done'
docker container rm -f test
# version
docker container run -d --name test -p 8080:8080 ${{ matrix.versions.IMAGES[1] }}
timeout 10 bash -c 'while ! curl --fail http://localhost:8080/__admin/; do sleep 1; done'
timeout 10 bash -c 'while ! curl --fail http://localhost:8080/__admin/webapp; do sleep 1; done'
docker container rm -f test
- name: Push wiremock-gui image to Docker HUB
Expand Down
6 changes: 2 additions & 4 deletions RELEASE-NOTES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
## New Feature
## Fix

- Update to wiremock 3.3.1
- Update nearly all ui dependencies
- Thx to Bootstrap 5.3.x we have a DarkMode now. LightMode is completely light now.
- Fix gradle build, so that ui is copied properly. Furthermore, improve tests to make sure ui is accessible.
9 changes: 5 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ allprojects {
mavenCentral()
}

version = '3.3.1.0'
version = '3.3.1.1'


sourceCompatibility = 11
Expand Down Expand Up @@ -448,15 +448,16 @@ task generateWebapp(type: Exec) {
}

task finalizeWebapp(type: Copy) {
mustRunAfter generateWebapp
dependsOn generateWebapp
// Because of: https://github.com/angular/angular-cli/issues/26304
// we need to copy some things around.
from 'webapp/wiremock/dist/browser'
into 'src/main/resources/assets/webapp'
}

jar.dependsOn generateWebapp
processResources.dependsOn generateWebapp
jar.dependsOn finalizeWebapp
processResources.dependsOn finalizeWebapp
check.dependsOn -= finalizeWebapp

task deleteGeneratedWebapp(type: Delete) {
delete 'src/main/resources/assets/webapp'
Expand Down

0 comments on commit 511f475

Please sign in to comment.