diff --git a/.github/workflows/docker_bin.yml b/.github/workflows/docker_bin.yml index 7baa9e5e7..01d146a7a 100644 --- a/.github/workflows/docker_bin.yml +++ b/.github/workflows/docker_bin.yml @@ -41,7 +41,7 @@ jobs: - name: Set TESTING id: set_testing run: | - echo "testing=${{ github.event_name == 'push' && (steps.vars.outputs.branch != 'master' || needs.set_environment_vars.outputs.guild_deploy_branch == 'docker-alpha') || github.event.inputs.testing }}" >> $GITHUB_OUTPUT + echo "testing=${{ github.event_name == 'push' && (steps.vars.outputs.branch != 'master') || github.event.inputs.testing }}" >> $GITHUB_OUTPUT - uses: actions/checkout@v3 with: ref: ${{ steps.set_guild_deploy_branch.outputs.guild_deploy_branch }} @@ -55,7 +55,7 @@ jobs: echo "cnversion=$(cat files/docker/node/release-versions/cardano-node-latest.txt)" >> $GITHUB_OUTPUT build_production: needs: set_environment_vars - if: needs.set_environment_vars.outputs.testing == 'false' && (needs.set_environment_vars.outputs.guild_deploy_branch == 'master' || needs.set_environment_vars.outputs.guild_deploy_branch == 'docker-alpha') + if: needs.set_environment_vars.outputs.testing == 'false' && (needs.set_environment_vars.outputs.guild_deploy_branch == 'master') env: REGISTRY: docker.io runs-on: ubuntu-latest diff --git a/scripts/grest-helper-scripts/grest-poll.sh b/scripts/grest-helper-scripts/grest-poll.sh index 8cc62d0b9..a5ab5f6a8 100755 --- a/scripts/grest-helper-scripts/grest-poll.sh +++ b/scripts/grest-helper-scripts/grest-poll.sh @@ -37,7 +37,7 @@ function chk_upd() { curr_hour=$(date +%H) if [[ ! -f "${PARENT}"/.last_grest_poll ]]; then echo "${curr_hour}" > "${PARENT}"/.last_grest_poll - curl -sfkL "${API_STRUCT_DEFINITION}" -o "${LOCAL_SPEC}" 2>/dev/null + curl -m 2 -sfkL "${API_STRUCT_DEFINITION}" -o "${LOCAL_SPEC}" 2>/dev/null else last_hour=$(cat "${PARENT}"/.last_grest_poll) [[ "${curr_hour}" == "${last_hour}" ]] && SKIP_UPDATE=Y || echo "${curr_hour}" > "${PARENT}"/.last_grest_poll @@ -55,7 +55,7 @@ function chk_upd() { exit 1 fi - curl -sfkL "${API_STRUCT_DEFINITION}" -o "${LOCAL_SPEC}" 2>/dev/null + curl -m 2 -sfkL "${API_STRUCT_DEFINITION}" -o "${LOCAL_SPEC}" 2>/dev/null checkUpdate "${PARENT}"/grest-poll.sh Y N N grest-helper-scripts [[ "$?" == "2" ]] && echo "ERROR: checkUpdate Failed" && exit 1 diff --git a/scripts/grest-helper-scripts/setup-grest.sh b/scripts/grest-helper-scripts/setup-grest.sh index 1ae850940..9886aa28f 100755 --- a/scripts/grest-helper-scripts/setup-grest.sh +++ b/scripts/grest-helper-scripts/setup-grest.sh @@ -16,7 +16,7 @@ # Do NOT modify code below # ###################################### -SGVERSION=v1.3.0 +SGVERSION=v1.3.1 ######## Functions ######## usage() { @@ -233,7 +233,7 @@ SGVERSION=v1.3.0 grep "^ /" "${CNODE_HOME}"/files/koiosapi.yaml | grep -v -e submittx -e "#RPC" | sed -e 's#^ /#/#' | cut -d: -f1 | sort > "${CNODE_HOME}"/files/grestrpcs 2>/dev/null echo "/control_table" >> "${CNODE_HOME}"/files/grestrpcs 2>/dev/null checkUpdate grest-poll.sh Y N N grest-helper-scripts >/dev/null - sed -i "s# API_STRUCT_DEFINITION=\"https://api.koios.rest/koiosapi.yaml\"# API_STRUCT_DEFINITION=\"https://${KOIOS_SRV}/koiosapi.yaml\"#g" grest-poll.sh + sed -i "s|^#API_STRUCT_DEFINITION=\"https://api.koios.rest/koiosapi.yaml\"|API_STRUCT_DEFINITION=\"https://${KOIOS_SRV}/koiosapi.yaml\"|g" grest-poll.sh checkUpdate checkstatus.sh Y N N grest-helper-scripts >/dev/null checkUpdate getmetrics.sh Y N N grest-helper-scripts >/dev/null }