From 57bdcfc4e4fefeb2c9da8a675f43be50347d2b23 Mon Sep 17 00:00:00 2001 From: David Date: Wed, 2 Oct 2024 01:11:44 +0200 Subject: [PATCH] ci: make all dependencies preemptible --- .github/helper/install.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/helper/install.sh b/.github/helper/install.sh index d5d1fc1733..a1430259cc 100644 --- a/.github/helper/install.sh +++ b/.github/helper/install.sh @@ -13,6 +13,9 @@ pip install frappe-bench githubbranch=${GITHUB_BASE_REF:-${GITHUB_REF##*/}} frappeuser=${FRAPPE_USER:-"frappe"} frappebranch=${FRAPPE_BRANCH:-$githubbranch} +erpnextbranch=${ERPNEXT_BRANCH:-$githubbranch} +paymentsbranch=${PAYMENTS_BRANCH:-${githubbranch%"-hotfix"}} +lendingbranch=${LENDING_BRANCH:-${githubbranch%"-hotfix"}} git clone "https://github.com/${frappeuser}/frappe" --branch "${frappebranch}" --depth 1 bench init --skip-assets --frappe-path ~/frappe --python "$(which python)" frappe-bench @@ -44,9 +47,9 @@ sed -i 's/schedule:/# schedule:/g' Procfile sed -i 's/socketio:/# socketio:/g' Procfile sed -i 's/redis_socketio:/# redis_socketio:/g' Procfile -bench get-app payments --branch ${githubbranch%"-hotfix"} -bench get-app https://github.com/frappe/erpnext --branch "$githubbranch" --resolve-deps -bench get-app https://github.com/frappe/lending --branch ${githubbranch%"-hotfix"} +bench get-app "https://github.com/${frappeuser}/payments" --branch "$paymentsbranch" +bench get-app "https://github.com/${frappeuser}/erpnext" --branch "$erpnextbranch" --resolve-deps +bench get-app "https://github.com/${frappeuser}/lending" --branch "$lendingbranch" bench get-app hrms "${GITHUB_WORKSPACE}" bench setup requirements --dev