Anand Doshi
9 years ago
4 changed files with 9 additions and 34 deletions
@ -1,11 +0,0 @@ |
|||
#!/bin/bash |
|||
|
|||
# stolen from http://cgit.drupalcode.org/octopus/commit/?id=db4f837 |
|||
includedir=`mysql_config --variable=pkgincludedir` |
|||
thiscwd=`pwd` |
|||
_THIS_DB_VERSION=`mysql -V 2>&1 | tr -d "\n" | cut -d" " -f6 | awk '{ print $1}' | cut -d"-" -f1 | awk '{ print $1}' | sed "s/[\,']//g"` |
|||
if [ "$_THIS_DB_VERSION" = "5.5.40" ] && [ ! -e "$includedir-$_THIS_DB_VERSION-fixed.log" ] ; then |
|||
cd $includedir |
|||
sudo patch -p1 < $thiscwd/ci/my_config.h.patch &> /dev/null |
|||
sudo touch $includedir-$_THIS_DB_VERSION-fixed.log |
|||
fi |
@ -1,22 +0,0 @@ |
|||
diff -burp a/my_config.h b/my_config.h
|
|||
--- a/my_config.h 2014-10-09 19:32:46.000000000 -0400
|
|||
+++ b/my_config.h 2014-10-09 19:35:12.000000000 -0400
|
|||
@@ -641,17 +641,4 @@
|
|||
#define SIZEOF_TIME_T 8 |
|||
/* #undef TIME_T_UNSIGNED */ |
|||
|
|||
-/*
|
|||
- stat structure (from <sys/stat.h>) is conditionally defined
|
|||
- to have different layout and size depending on the defined macros.
|
|||
- The correct macro is defined in my_config.h, which means it MUST be
|
|||
- included first (or at least before <features.h> - so, practically,
|
|||
- before including any system headers).
|
|||
-
|
|||
- __GLIBC__ is defined in <features.h>
|
|||
-*/
|
|||
-#ifdef __GLIBC__
|
|||
-#error <my_config.h> MUST be included first!
|
|||
-#endif
|
|||
-
|
|||
#endif |
|||
|
@ -0,0 +1,8 @@ |
|||
#!/bin/bash |
|||
|
|||
cd ~/ |
|||
curl -I https://github.com/frappe/frappe/tree/$TRAVIS_BRANCH | head -n 1 | cut -d $' ' -f2 | ( |
|||
read response; |
|||
[ $response == '200' ] && branch=$TRAVIS_BRANCH || branch='develop'; |
|||
bench init frappe-bench --frappe-path https://github.com/frappe/frappe.git --frappe-branch $branch |
|||
) |
Loading…
Reference in new issue