diff --git a/webhooks-git/assets-hook.sh b/webhooks-git/assets-hook.sh index 7cf9c30..e3f5105 100644 --- a/webhooks-git/assets-hook.sh +++ b/webhooks-git/assets-hook.sh @@ -11,8 +11,8 @@ fi # Echo parameters echo "Webhook recieved for repository: $repository_name and branch: $branch_name" -repository_name="$2" -branch_name=$(basename "$1") +repository_name="$1" +branch_name=$(basename "$2") if [ "$branch_name" != "main" ]; then echo "Error: This hook must only update branch main, not $branch_name" diff --git a/webhooks-git/hooks.json.tmpl b/webhooks-git/hooks.json.tmpl index 6cd652a..822278c 100644 --- a/webhooks-git/hooks.json.tmpl +++ b/webhooks-git/hooks.json.tmpl @@ -16,11 +16,11 @@ [ { "source": "payload", - "name": "ref" + "name": "repository.name" }, { "source": "payload", - "name": "repository.name" + "name": "ref" } ], "trigger-rule": diff --git a/webhooks-git/programm-hook.sh b/webhooks-git/programm-hook.sh index c2ef161..7f9ba3c 100644 --- a/webhooks-git/programm-hook.sh +++ b/webhooks-git/programm-hook.sh @@ -6,8 +6,8 @@ if [ "$#" -ne 2 ]; then exit 1 fi -repository_name="$2" -branch_name=$(basename "$1") +repository_name="$1" +branch_name=$(basename "$2") BRANCHES_FOLDER="/html/branches" PROGRAMM_REPOSITORY="git_programm:AG-Programm/parteiprogramm.git"