diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index e1ba0340..53365087 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -27,7 +27,7 @@ jobs: tea login add --name gitea-rinoa --url ${{ secrets.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }} tea login default gitea-rinoa echo "Checking if PR exists for ${{ github.ref_name }}..." - tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head,state --output csv | egrep '${{ github.ref_name }}' | head -1 | egrep 'open' + tea pr ls --repo ${{ github.repository }} --state all --fields index,title,head,state --output csv | egrep '${{ github.ref_name }}' | head -1 | egrep -q 'open' if [ $? -eq 0 ]; then echo "An open PR exists, skipping creation..." elif [ $? -eq 1 ]; then diff --git a/docker-compose.yml b/docker-compose.yml index ddf442bf..216c57d1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3031,7 +3031,7 @@ services: TZ: America/New_York MYSQL_PASSWORD: VQU23wHKRNmfpAPt5E9BxMaSGJdWjLuz healthcheck: - test: "/usr/bin/mariadb -u root -p${MARIADB_ENVIRONMENT_MYSQL_ROOT_PASSWORD} -e \"SHOW DATABASES;\"" + test: /usr/bin/mariadb -u root -p${MARIADB_ENVIRONMENT_MYSQL_ROOT_PASSWORD} -e "SHOW DATABASES;" interval: 10s timeout: 5s retries: 3