Skip to content

Commit 7961c9d

Browse files
committed
php: use libcouchbase with openssl fix
1 parent c69053a commit 7961c9d

2 files changed

Lines changed: 51 additions & 51 deletions

File tree

php/Jenkinsfile.erb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ end
151151
}
152152
}
153153
<% lcb_root = "install\\\\libcouchbase-windows_#{msvc_ver(php_ver)}-amd64" %>
154-
<% lcb_ver = "3.2.3-cb1#{'.openssl' if has_ssl}" %>
154+
<% lcb_ver = "3.2.3-cb3#{'.openssl' if has_ssl}" %>
155155
stage('lcb') {
156156
steps {
157157
dir('<%= work_dir %>') {
@@ -195,7 +195,7 @@ vc_vars = "%PROGRAMFILES(X86)%\\\\Microsoft Visual Studio\\\\#{msvc_ver(php_ver)
195195
}
196196
}
197197
stage('test') {
198-
<% mock_ver = '1.5.23' %>
198+
<% mock_ver = '1.5.25' %>
199199
<% mock_jar = 'tests\\\\CouchbaseMock.jar' %>
200200
<% mock_port = 1000 * (ts == 'zts' ? 1 : 2) + php_ver.scan(/\d/).join.to_i %>
201201
environment {
@@ -214,7 +214,7 @@ vc_vars = "%PROGRAMFILES(X86)%\\\\Microsoft Visual Studio\\\\#{msvc_ver(php_ver)
214214
bat("<%= php %> -d extension=%cd%\\release\\ext\\php_couchbase.dll -i")
215215
bat('<%= php_root %>\\msys2\\usr\\bin\\wget.exe -O <%= mock_jar %> http://packages.couchbase.com/clients/c/mock/CouchbaseMock-<%= mock_ver %>.jar')
216216
bat("""
217-
start /b cmd /c java -jar <%= mock_jar %> --harakiri-monitor 127.0.0.1:<%= mock_port %>
217+
start /b cmd /c java -jar <%= mock_jar %> --cccp --harakiri-monitor 127.0.0.1:<%= mock_port %>
218218
<%= php %> -d extension=php_phar.dll -d extension=%cd%\\release\\ext\\php_couchbase.dll -d couchbase.log_level=TRACE <%= php_root %>\\php-phpunit.phar --debug %cd%\\tests\\
219219
""")
220220
<% release_dir = "php_couchbase-#{php_ver}-#{ts}-#{arch}#{'-openssl' if has_ssl}" %>

0 commit comments

Comments
 (0)