Skip to content

Commit 7aacb79

Browse files
authored
Merge branch 'master' into fix_tls_failure
2 parents 2c8b0cf + 0e5375a commit 7aacb79

562 files changed

Lines changed: 24922 additions & 12186 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.cspell.json

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
"dev-requirements.txt",
1717
"press/utils/country_timezone.py",
1818
".secrets.baseline",
19-
"**go.sum"
19+
"**go.sum",
20+
"libs/**"
2021
],
2122
"words": [
2223
"2.4.6",
@@ -174,7 +175,6 @@
174175
"emaill",
175176
"emandate",
176177
"Ensenada",
177-
"env",
178178
"EPERM",
179179
"equivs",
180180
"erikgeiser",
@@ -499,8 +499,8 @@
499499
"probability",
500500
"proces",
501501
"procs",
502-
"promql",
503502
"proot",
503+
"promql",
504504
"protoc",
505505
"psync",
506506
"ptype",
@@ -780,6 +780,17 @@
780780
"picklable",
781781
"ndarray",
782782
"mult",
783-
"ruleid"
783+
"ruleid",
784+
"chatwoot",
785+
"ssti",
786+
"tcmalloc",
787+
"libncurses",
788+
"libncursesw",
789+
"DWITHOUT",
790+
"wextra",
791+
"SONAME",
792+
"decommitted",
793+
"libgnutls",
794+
"UDF"
784795
]
785796
}

.github/helper/install.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ set -e
44

55
cd ~ || exit
66

7+
pip install frappe-bench
78
bench init --skip-assets --python "$(which python)" ~/frappe-bench --frappe-path https://github.com/balamurali27/frappe --frappe-branch fc-ci
89

910
mysql --host 127.0.0.1 --port 3306 -u root -proot -e "SET GLOBAL character_set_server = 'utf8mb4'"
@@ -20,6 +21,7 @@ bench get-app press "${GITHUB_WORKSPACE}"
2021

2122
bench setup requirements --dev
2223

24+
export CI=Yes
2325
bench new-site --mariadb-user-host-login-scope='%' --db-root-password root --admin-password admin test_site
2426
bench --site test_site install-app press
2527
bench set-config -g server_script_enabled 1

0 commit comments

Comments
 (0)