From acd6c00683519ff8f2d92bdb4426cab926c30abd Mon Sep 17 00:00:00 2001 From: Duncan Paterson Date: Thu, 11 Apr 2024 23:23:32 +0200 Subject: [PATCH] Update build.yml Co-authored-by: Joe Wicentowski --- .github/workflows/build.yml | 5 ++--- tests/bats/smoke-test.bats | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cec9ce86f..29adf5551 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,8 +33,7 @@ jobs: # TODO(DP) Validate ? - name: Ensure all XML files are well-formed run: | - xmllint --noout \ - $(find . -type f -name '*.xml') + find . -type f -name '*.xml' -print0 | xargs -0 xmllint -noout # Build - name: Setup Node.js @@ -48,7 +47,7 @@ jobs: with: distribution: 'temurin' java-version: ${{ matrix.java-version }} - - run: -Dapp.version=1.0.0-SNAPSHOT + - run: ant -Dapp.version=1.0.0-SNAPSHOT - name: Add expath dependencies working-directory: build diff --git a/tests/bats/smoke-test.bats b/tests/bats/smoke-test.bats index 3334c8fed..c9373bb34 100644 --- a/tests/bats/smoke-test.bats +++ b/tests/bats/smoke-test.bats @@ -25,7 +25,7 @@ # Make sure the package has been deployed @test "logs show package deployment" { - result=$(docker logs exist | grep -o 'http://history.state.gov/ns/site/hsg') + result=$(docker logs exist | grep -om 1 'http://history.state.gov/ns/site/hsg') [ "$result" == 'http://history.state.gov/ns/site/hsg' ] }