File tree Expand file tree Collapse file tree 1 file changed +11
-3
lines changed Expand file tree Collapse file tree 1 file changed +11
-3
lines changed Original file line number Diff line number Diff line change @@ -45,7 +45,15 @@ build_sqlcipher() {
45
45
rm -f " $header_path " " $impl_path "
46
46
mkdir -p " ${sqlcipher_path} /include"
47
47
cp -f " ${tempdir} /sqlite3.h" " $header_path "
48
- cp -f " ${tempdir} /sqlite3.c" " $impl_path "
48
+ cp -f " ${tempdir} /sqlite3.c" " ${impl_path} .tmp"
49
+ echo " ✅"
50
+
51
+ # Including param.h unconditionally removes compile time
52
+ # warnings about ambiguous MIN and MAX macros.
53
+ printf ' %s' " Patching sqlite.c ... "
54
+ echo " #include <sys/param.h>" > " $impl_path "
55
+ cat " ${impl_path} .tmp" >> " $impl_path "
56
+ rm -f " ${impl_path} .tmp"
49
57
echo " ✅"
50
58
}
51
59
@@ -95,7 +103,6 @@ build_and_test_release() {
95
103
swift test --skip " EncryptionTests.testSQLCipher3Compatibility"
96
104
97
105
echo " "
98
- echo " Building using release configuration ..."
99
106
swift build -c release
100
107
101
108
cat << - EOF
@@ -111,7 +118,8 @@ setup_new_release_branch() {
111
118
local release_branch=" release/${new_version} "
112
119
113
120
git checkout -b " $release_branch "
114
- git commit " $sqlcipher_path " -m " DuckDuckGo GRDB.swift ${new_version} (GRDB ${upstream-version} , SQLCipher ${sqlcipher_version} )"
121
+ git add " ${cwd} /.github/README.md" " $sqlcipher_path "
122
+ git commit -m " DuckDuckGo GRDB.swift ${new_version} (GRDB ${upstream-version} , SQLCipher ${sqlcipher_version} )"
115
123
116
124
cat << - EOF
117
125
You can’t perform that action at this time.
0 commit comments