From 1723a6dc9dbe15502f9bec5c901d563318413d6e Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 5 Jul 2022 14:59:11 +0530 Subject: [PATCH] ci: Add mariadb system dependency --- .github/helper/install.sh | 8 ++------ .github/helper/install_dependencies.sh | 17 +++++++++-------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/.github/helper/install.sh b/.github/helper/install.sh index d038be1b23..88ca012c9b 100644 --- a/.github/helper/install.sh +++ b/.github/helper/install.sh @@ -1,9 +1,9 @@ #!/bin/bash - set -e - cd ~ || exit +echo "Setting Up Bench..." + pip install frappe-bench bench -v init frappe-bench --skip-assets --python "$(which python)" --frappe-path "${GITHUB_WORKSPACE}" @@ -17,10 +17,6 @@ if [ "$TYPE" == "server" ]; then fi if [ "$DB" == "mariadb" ];then - curl -LsS -O https://downloads.mariadb.com/MariaDB/mariadb_repo_setup - sudo bash mariadb_repo_setup --mariadb-server-version=10.6 - sudo apt install mariadb-client - mariadb --host 127.0.0.1 --port 3306 -u root -ptravis -e "SET GLOBAL character_set_server = 'utf8mb4'"; mariadb --host 127.0.0.1 --port 3306 -u root -ptravis -e "SET GLOBAL collation_server = 'utf8mb4_unicode_ci'"; diff --git a/.github/helper/install_dependencies.sh b/.github/helper/install_dependencies.sh index 397203f3cc..f16bd61a53 100644 --- a/.github/helper/install_dependencies.sh +++ b/.github/helper/install_dependencies.sh @@ -1,12 +1,13 @@ #!/bin/bash - set -e - # install wkhtmltopdf -wget -O /tmp/wkhtmltox.tar.xz https://github.com/frappe/wkhtmltopdf/raw/master/wkhtmltox-0.12.3_linux-generic-amd64.tar.xz -tar -xf /tmp/wkhtmltox.tar.xz -C /tmp -sudo mv /tmp/wkhtmltox/bin/wkhtmltopdf /usr/local/bin/wkhtmltopdf -sudo chmod o+x /usr/local/bin/wkhtmltopdf +echo "Setting Up System Dependencies..." + +wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.focal_amd64.deb +sudo apt install ./wkhtmltox_0.12.6-1.focal_amd64.deb + +curl -LsS -O https://downloads.mariadb.com/MariaDB/mariadb_repo_setup +sudo bash mariadb_repo_setup --mariadb-server-version=10.6 -# install cups -sudo apt update && sudo apt install libcups2-dev libmariadb-dev redis-server +sudo apt update +sudo apt install libcups2-dev redis-server libmariadb3 libmariadb-dev mariadb-client