From dd331f75c94eff6a09bc5d21ef5af19bb78ef721 Mon Sep 17 00:00:00 2001 From: Leendert de Borst Date: Mon, 18 Nov 2024 11:10:23 +0100 Subject: [PATCH] Fix regex (#374) --- .github/workflows/docker-compose-build.yml | 4 ++-- .github/workflows/docker-compose-pull.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-compose-build.yml b/.github/workflows/docker-compose-build.yml index fd9745c87..755ea9ca9 100644 --- a/.github/workflows/docker-compose-build.yml +++ b/.github/workflows/docker-compose-build.yml @@ -91,8 +91,8 @@ jobs: - name: Test build.sh --reset-password output run: | output=$(./build.sh --reset-password) - if ! echo "$output" | grep -E '^New admin password: [A-Za-z0-9+/=]{8,}$'; then - echo "Password reset output format is incorrect. Expected format: 'New admin password: '" + if ! echo "$output" | grep -E '.*New admin password: [A-Za-z0-9]{8,}.*'; then + echo "Password reset output format is incorrect. Expected format: 'New admin password: '" echo "Actual output: $output" exit 1 else diff --git a/.github/workflows/docker-compose-pull.yml b/.github/workflows/docker-compose-pull.yml index 6b191a233..10a0ffea5 100644 --- a/.github/workflows/docker-compose-pull.yml +++ b/.github/workflows/docker-compose-pull.yml @@ -91,7 +91,7 @@ jobs: - name: Test install.sh --reset-password output run: | output=$(./install.sh --reset-password) - if ! echo "$output" | grep -E '^New admin password: [A-Za-z0-9+/=]{8,}$'; then + if ! echo "$output" | grep -E '.*New admin password: [A-Za-z0-9]{8,}.*'; then echo "Password reset output format is incorrect. Expected format: 'New admin password: '" echo "Actual output: $output" exit 1