Skip to content

Commit

Permalink
ci: remove the "api" event type and fix the help
Browse files Browse the repository at this point in the history
  • Loading branch information
rimelek committed Jul 28, 2022
1 parent 2f50294 commit 3e388ff
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
4 changes: 2 additions & 2 deletions ci/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ while getopts ":t:b:i:e:r:R:B:p:dh" opt; do
d) CI_DEBUG="true" ;;
e)
case "$OPTARG" in
push | api | cron) CI_EVENT_TYPE="$OPTARG" ;;
push | cron) CI_EVENT_TYPE="$OPTARG" ;;
*)
echo >&2 "Invalid event type: $OPTARG"
exit 1
Expand All @@ -41,7 +41,7 @@ while getopts ":t:b:i:e:r:R:B:p:dh" opt; do
echo -e "\t-t <string>\tGit commit tag if the build was triggered by tag. Do not use it anyway!"
echo -e "\t-b <string>\tGit branch if the build was triggered by branch. If \"-t\" was given too, \"-b\" will always be ignored!"
echo -e "\t-i <string>\tDocker image name without version tag."
echo -e "\t-e <string>\tEvent type. Valid types: "
echo -e "\t-e <string>\tEvent type. Valid types: api, cron"
echo -e "\t-r <string>\tRemote repository alias. Default: origin"
echo -e "\t-R <string>\tRemote repository URL. Default: the url of the repository alias"
echo -e "\t-B <string>\tBuild number. git commit hash by default"
Expand Down
4 changes: 2 additions & 2 deletions ci/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ while getopts ":t:b:i:I:e:B:dh" opt; do
d) CI_DEBUG="true" ;;
e)
case "$OPTARG" in
push | api | cron) CI_EVENT_TYPE="$OPTARG" ;;
push | cron) CI_EVENT_TYPE="$OPTARG" ;;
*)
echo >&2 "Invalid event type: $OPTARG"
exit 1
Expand All @@ -38,7 +38,7 @@ while getopts ":t:b:i:I:e:B:dh" opt; do
echo -e "\t-b <string>\tGit branch if the build was triggered by branch. If \"-t\" was given too, \"-b\" will always be ignored!"
echo -e "\t-i <string>\tDocker image name without version tag."
echo -e "\t-I <string>\tAlternative Docker image name without version tag. Can be used to push to a second repository."
echo -e "\t-e <string>\tEvent type. Valid types: "
echo -e "\t-e <string>\tEvent type. Valid types: api, cron"
echo -e "\t-B <string>\tBuild number. git commit hash by default"
echo -e "\t-d \tTurn on debug outputs"
echo -e "\t-h \tShows this help message"
Expand Down
8 changes: 5 additions & 3 deletions ci/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ while getopts ":i:e:T:hs" opt; do
T) CI_DOCKER_START_TIMEOUT="$OPTARG" ;;
e)
case "$OPTARG" in
push | api | cron) CI_EVENT_TYPE="$OPTARG" ;;
push | cron) CI_EVENT_TYPE="$OPTARG" ;;
*)
echo >&2 "Invalid event type: $OPTARG"
exit 1
Expand All @@ -29,8 +29,10 @@ while getopts ":i:e:T:hs" opt; do
echo "Usage: $0 [options]"
echo "Options:"
echo -e "\t-i <string>\tDocker image name without version tag."
echo -e "\t-s\t\tSkip running tests"
echo -e "\t-h\t\tShows this help message"
echo -e "\t-s \tSkip running tests"
echo -e "\t-T \tStart timeout before considering the test failed."
echo -e "\t-e <string>\tEvent type. Valid types: api, cron"
echo -e "\t-h \tShows this help message"
exit 0
;;
*)
Expand Down

0 comments on commit 3e388ff

Please sign in to comment.