Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/scripts/gitlab
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,9 @@ del.merge_request.id ()
get.commit.status ()
{ # $1=project, $2=sha
api "GET" "projects/${1}/repository/commits/${2}/statuses" \
| jq -r '.[].status'
| jq -r '.[].status' \
| head -n 1 \
| tr -d '[:space:]'
}

poll.commit.status ()
Expand All @@ -83,19 +85,17 @@ poll.commit.status ()
local status laststatus

let attempt+=1
laststatus="pending"

while true; do
attempt=$(($attempt + 1))
status=$(get.commit.status "${1}" "${2}")
status=$(echo $(get.commit.status "${1}" "${2}"))

info "polling commit status: ${attempt} or ${POLL_ATTEMPTS}"

if [ "${status}" != "${laststatus}" ]; then
info "- pipeline in ${status:-$laststatus}"
info "polling commit status: ${attempt}"
if [ "${status:-}" != "${laststatus:-}" ]; then
info "- pipeline in ${status:-none} was ${laststatus:-none}"
fi

case "${status}" in
case "${status:-}" in
success) return 0 ;;
failed) return 1 ;;
canceled) return 1 ;;
Expand Down
8 changes: 7 additions & 1 deletion scanner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@
export BOOST_DOWNLOAD_URL=${BOOST_DOWNLOAD_URL:-${BOOST_CLI_URL}/boost-cli/get-boost-cli}

export BOOST_LOG_COLORS="true"

if [ -n "${BOOST_TRIGGER_ID:-}" ]; then
export BOOST_SCAN_MODE="trigger"
else
export BOOST_SCAN_MODE="repo"
fi
}

boost_init_cli () {
Expand Down Expand Up @@ -87,6 +93,6 @@
- .boost_setup
- .boost_rules
script:
- ${BOOST_EXE} scan repo ${BOOST_CLI_ARGUMENTS:-}
- ${BOOST_EXE} scan ${BOOST_SCAN_MODE} ${BOOST_CLI_ARGUMENTS:-}
variables:
GIT_DEPTH: 1