summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.circleci/config.yml2
-rw-r--r--Bugzilla/Markdown/GFM.pm4
-rw-r--r--Dockerfile3
-rwxr-xr-xMakefile.PL2
-rw-r--r--t/markdown.t6
5 files changed, 9 insertions, 8 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index f64524c80..224abfa22 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,7 +7,7 @@ version: 2
defaults:
bmo_slim_image: &bmo_slim_image
- image: mozillabteam/bmo-slim:20180809.1
+ image: mozillabteam/bmo-slim:20180918.1
user: app
mysql_image: &mysql_image
diff --git a/Bugzilla/Markdown/GFM.pm b/Bugzilla/Markdown/GFM.pm
index f3f24fc6a..367dc7a53 100644
--- a/Bugzilla/Markdown/GFM.pm
+++ b/Bugzilla/Markdown/GFM.pm
@@ -69,9 +69,9 @@ $FFI->attach(cmark_markdown_to_html => ['opaque', 'int', 'markdown_options_t'] =
);
# This has to happen after something from the main lib is loaded
-$FFI->attach('core_extensions_ensure_registered' => [] => 'void');
+$FFI->attach('cmark_gfm_core_extensions_ensure_registered' => [] => 'void');
-core_extensions_ensure_registered();
+cmark_gfm_core_extensions_ensure_registered();
Bugzilla::Markdown::GFM::SyntaxExtension->SETUP($FFI);
Bugzilla::Markdown::GFM::SyntaxExtensionList->SETUP($FFI);
diff --git a/Dockerfile b/Dockerfile
index fd02f222d..ecea67ed7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM mozillabteam/bmo-slim:20180809.1
+FROM mozillabteam/bmo-slim:20180918.1
ARG CI
ARG CIRCLE_SHA1
@@ -22,7 +22,6 @@ RUN mv /opt/bmo/local /app && \
chown -R app:app /app && \
perl -I/app -I/app/local/lib/perl5 -c -E 'use Bugzilla; BEGIN { Bugzilla->extensions }' && \
perl -c /app/scripts/entrypoint.pl && \
- setcap 'cap_net_bind_service=+ep' /usr/sbin/httpd && \
setcap 'cap_net_bind_service=+ep' /usr/bin/perl
USER app
diff --git a/Makefile.PL b/Makefile.PL
index 7e3095867..495c07c58 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -33,7 +33,7 @@ BEGIN {
# PREREQ_PM
my %requires = (
- 'Alien::libcmark_gfm' => 0,
+ 'Alien::libcmark_gfm' => '3',
'Algorithm::BloomFilter' => '0.02',
'CGI' => '4.31',
'CGI::Compile' => 0,
diff --git a/t/markdown.t b/t/markdown.t
index 0344706c9..83e0dc051 100644
--- a/t/markdown.t
+++ b/t/markdown.t
@@ -9,7 +9,7 @@ use strict;
use warnings;
use lib qw( . lib local/lib/perl5 );
use Bugzilla;
-use Test::More;
+use Test2::V0;
my $parser = Bugzilla->markdown_parser;
@@ -61,7 +61,9 @@ my $table_html = <<'HTML';
<tr>
<td>val1</td>
<td align="center">val2</td>
-</tr></tbody></table>
+</tr>
+</tbody>
+</table>
HTML
is(