From b22c33e1d68d24829829b77c4215e51bc8b8f18a Mon Sep 17 00:00:00 2001 From: jasquat Date: Thu, 16 Feb 2023 15:19:01 -0500 Subject: [PATCH] put the env vars in the env section of the github action configs w/ burnettk --- .github/workflows/frontend_tests.yml | 1 + spiffworkflow-backend/bin/wait_for_server_to_be_up | 1 + spiffworkflow-backend/keycloak/bin/wait_for_keycloak | 3 ++- spiffworkflow-frontend/bin/wait_for_frontend_to_be_up | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/frontend_tests.yml b/.github/workflows/frontend_tests.yml index 79515c05..e6f7d891 100644 --- a/.github/workflows/frontend_tests.yml +++ b/.github/workflows/frontend_tests.yml @@ -29,6 +29,7 @@ jobs: with: working-directory: ./spiffworkflow-frontend browser: chrome + env: # pass GitHub token to allow accurately detecting a build vs a re-run build GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} CYPRESS_SPIFFWORKFLOW_FRONTEND_AUTH_WITH_KEYCLOAK: "false" diff --git a/spiffworkflow-backend/bin/wait_for_server_to_be_up b/spiffworkflow-backend/bin/wait_for_server_to_be_up index a737aaf2..04cff3aa 100755 --- a/spiffworkflow-backend/bin/wait_for_server_to_be_up +++ b/spiffworkflow-backend/bin/wait_for_server_to_be_up @@ -20,3 +20,4 @@ while [[ "$(curl -s -o /dev/null -w '%{http_code}' "http://localhost:${port}/v1. attempts=$(( attempts + 1 )) sleep 1 done +echo "backend up" diff --git a/spiffworkflow-backend/keycloak/bin/wait_for_keycloak b/spiffworkflow-backend/keycloak/bin/wait_for_keycloak index 6164a8f6..1002fb67 100755 --- a/spiffworkflow-backend/keycloak/bin/wait_for_keycloak +++ b/spiffworkflow-backend/keycloak/bin/wait_for_keycloak @@ -10,7 +10,7 @@ set -o errtrace -o errexit -o nounset -o pipefail max_attempts="${1:-100}" port="${2:-7002}" -echo "waiting for backend to come up..." +echo "waiting for keycloak to come up..." attempts=0 while [[ "$(curl -s -o /dev/null -w '%{http_code}' "http://localhost:${port}/realms/master/.well-known/openid-configuration")" != "200" ]]; do if [[ "$attempts" -gt "$max_attempts" ]]; then @@ -20,3 +20,4 @@ while [[ "$(curl -s -o /dev/null -w '%{http_code}' "http://localhost:${port}/rea attempts=$(( attempts + 1 )) sleep 1 done +echo "keycloak up" diff --git a/spiffworkflow-frontend/bin/wait_for_frontend_to_be_up b/spiffworkflow-frontend/bin/wait_for_frontend_to_be_up index 9a49bd44..6f16d9af 100755 --- a/spiffworkflow-frontend/bin/wait_for_frontend_to_be_up +++ b/spiffworkflow-frontend/bin/wait_for_frontend_to_be_up @@ -20,3 +20,4 @@ while [[ "$(curl -s -o /dev/null -w '%{http_code}' "http://localhost:${port}")" attempts=$(( attempts + 1 )) sleep 1 done +echo "frontend up"