Skip to content

Feature: Add support for more fields, allow branch+commit+tag, fix error output #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
henrygrant wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Feature: Add support for more fields, allow branch+commit+tag, fix error output #37

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7bb2035
feat: add support for commit message, remove rule regarding only one …
henrygrant Mar 6, 2023
78f6fdb
add more fields, fix error message ref
henrygrant Mar 14, 2023
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
76 changes: 58 additions & 18 deletions gitrise.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,26 @@ function usage() {
echo ""
echo "Usage: gitrise.sh [-d] [-e] [-h] [-T] [-v] -a token -s project_slug -w workflow [-b branch|-t tag|-c commit]"
echo
echo " -a, --access-token <string> Bitrise access token"
echo " -b, --branch <string> Git branch"
echo " -c, --commit <string> Git commit hash "
echo " -d, --debug Debug mode enabled"
echo " -e, --env <string> List of environment variables in the form of key1:value1,key2:value2"
echo " -h, --help Print this help text"
echo " -p, --poll <string> Polling interval (in seconds) to get the build status."
echo " --stream Stream build logs"
echo " -s, --slug <string> Bitrise project slug"
echo " -T, --test Test mode enabled"
echo " -t, --tag <string> Git tag"
echo " -v, --version App version"
echo " -w, --workflow <string> Bitrise workflow"
echo " -a, --access-token <string> Bitrise access token"
echo " -b, --branch <string> Git branch"
echo " -bd, --branch-dest <string> Git destination branch"
echo " -c, --commit <string> Git commit hash"
echo " -m, --message <string> Git commit message"
echo " -d, --debug Debug mode enabled"
echo " -e, --env <string> List of environment variables in the form of key1:value1,key2:value2"
echo " -h, --help Print this help text"
echo " -prid, --pull-request-id <string> ID of the pull request."
echo " -pra, --pull-request-author <string> Author of the pull request"
echo " -prhb, --pull-request-head-branch <string> Head branch of the pull request (feature)"
echo " -prmb, --pull-request-merge-branch <string> Merge branch of the pull request (feature)"
echo " -prru, --pull-request-repository-url <string> URL of the repository of the pull request"
echo " -p, --poll <string> Polling interval (in seconds) to get the build status."
echo " --stream Stream build logs"
echo " -s, --slug <string> Bitrise project slug"
echo " -T, --test Test mode enabled"
echo " -t, --tag <string> Git tag"
echo " -v, --version App version"
echo " -w, --workflow <string> Bitrise workflow"
echo
}

Expand All @@ -51,6 +58,10 @@ while [ $# -gt 0 ]; do
-c|--commit)
COMMIT="$2"
shift;shift
;;
-m|--message)
MESSAGE="$2"
shift;shift
;;
-t|--tag)
TAG="$2"
Expand All @@ -60,6 +71,10 @@ while [ $# -gt 0 ]; do
BRANCH="$2"
shift;shift
;;
-bd|--branch-dest)
BRANCH_DEST="$2"
shift;shift
;;
-a|--access-token)
ACCESS_TOKEN="$2"
shift;shift
Expand Down Expand Up @@ -88,6 +103,26 @@ while [ $# -gt 0 ]; do
STREAM="true"
shift
;;
-prid|--pull-request-id)
PULL_REQUEST_ID="$2"
shift;shift
;;
-pra|--pull-request-author)
PULL_REQUEST_AUTHOR="$2"
shift;shift
;;
-prhb|--pull-request-head-branch)
PULL_REQUEST_HEAD_BRANCH="$2"
shift;shift
;;
-prmb|--pull-request-merge-branch)
PULL_REQUEST_MERGE_BRANCH="$2"
shift;shift
;;
-prru|--pull-request-repository-url)
PULL_REQUEST_REPOSITORY_URL="$2"
shift;shift
;;
-p|--poll)
STATUS_POLLING_INTERVAL="$2"
shift;shift
Expand Down Expand Up @@ -118,9 +153,7 @@ function validate_input() {
[[ -n "$COMMIT" ]] && ((count++))
[[ -n "$BRANCH" ]] && ((count++))

if [[ $count -gt 1 ]]; then
printf "\n\e[33m Warning: Too many building arguments passed. Only one of these is needed: --commit, --tag, --branch \e[0m\n"
elif [[ $count == 0 ]]; then
if [[ $count == 0 ]]; then
printf "\e[31m ERROR: Missing build argument. Pass one of these: --commit, --tag, --branch\e[0m\n"
usage
exit 1
Expand Down Expand Up @@ -167,9 +200,16 @@ function generate_build_payload() {
{
"build_params": {
"branch": "$BRANCH",
"branch_dest": "$BRANCH_DEST",
"commit_hash": "$COMMIT",
"commit_message": "$MESSAGE",
Copy link

@Macjon Macjon Nov 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've tested this implementation and this will not work when your commit message contains spaces. I changed the generate_build_payload() implementation so it used jq to create the payload.

function generate_build_payload() {
    local environments=$(process_env_vars "$ENV_STRING")
    jq -n --arg branch "$BRANCH" \
          --arg commit "$COMMIT" \
          --arg message "$MESSAGE" \
          --arg tag "$TAG" \
          --arg workflow "$WORKFLOW" \
          --argjson environments "$environments" \
    '{
        build_params: {
            branch: $branch,
            commit_hash: $commit,
            commit_message: $message,
            tag: $tag,
            workflow_id: $workflow,
            environments: $environments
        },
        hook_info: {
            type: "bitrise"
        }
    }'
}

"tag": "$TAG",
"workflow_id" : "$WORKFLOW",
"workflow_id": "$WORKFLOW",
"pull_request_id": "$PULL_REQUEST_ID",
"pull_request_author": "$PULL_REQUEST_AUTHOR",
"pull_request_head_branch": "$PULL_REQUEST_HEAD_BRANCH",
"pull_request_merge_branch": "$PULL_REQUEST_MERGE_BRANCH",
"pull_request_repository_url": "$PULL_REQUEST_REPOSITORY_URL",
"environments": $environments
},
"hook_info": {
Expand All @@ -193,7 +233,7 @@ function trigger_build() {

status=$(echo "$response" | jq ".status" | sed 's/"//g' )
if [ "$status" != "ok" ]; then
msg=$(echo "$response" | jq ".message" | sed 's/"//g')
msg=$(echo "$response" | jq ".error_msg" | sed 's/"//g')
printf "%s" "ERROR: $msg"
exit 1
else
Expand Down