From 6f92b7e12082a1781b1b5eb4179ee94f9aa172e5 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Tue, 2 Jun 2020 10:52:24 +0200
Subject: [PATCH 1/2] =?UTF-8?q?Build=20the=20CI=C2=A0also=20on=20bionic.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bionic has a more recent compiler who will catch more issue with the
code.
---
 .github/workflows/ci.yml | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3dfbd66fb..e93b825ff 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -53,30 +53,41 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target:
+        name:
           - native_static
           - native_dyn
+          - native_dyn_bionic
           - android_arm
           - android_arm64
           - win32_static
           - win32_dyn
         include:
-          - target: native_static
+          - name: native_static
+            target: native_static
             image_variant: xenial
             lib_postfix: '/x86_64-linux-gnu'
-          - target: native_dyn
+          - name: native_dyn
+            target: native_dyn
             image_variant: xenial
             lib_postfix: '/x86_64-linux-gnu'
-          - target: android_arm
+          - name: native_dyn_bionic
+            target: native_dyn
+            image_variant: bionic
+            lib_postfix: '/x86_64-linux-gnu'
+          - name: android_arm
+            target: android_arm
             image_variant: xenial
             lib_postfix: '/x86_64-linux-gnu'
-          - target: android_arm64
+          - name: android_arm64
+            target: android_arm64
             image_variant: xenial
             lib_postfix: '/x86_64-linux-gnu'
-          - target: win32_static
+          - name: win32_static
+            target: win32_static
             image_variant: f31
             lib_postfix: '64'
-          - target: win32_dyn
+          - name: win32_dyn
+            target: win32_dyn
             image_variant: f31
             lib_postfix: '64'
     env:
@@ -147,6 +158,6 @@ jobs:
         curl https://codecov.io/bash -o codecov.sh
         bash codecov.sh -n "${OS_NAME}_${{matrix.target}}" -Z
         rm codecov.sh
-      if: startsWith(matrix.target, 'native_')
+      if: startsWith(matrix.target, 'native_') && matrix.image_variant == 'xenial'
       env:
         CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

From 157d1664cf1f67643ff323af0b3bf6eb03a64fdd Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Tue, 9 Jun 2020 11:53:20 +0200
Subject: [PATCH 2/2] Fix test compilation on bionic

---
 test/server.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/server.cpp b/test/server.cpp
index 4f37f06ec..36f2a5637 100644
--- a/test/server.cpp
+++ b/test/server.cpp
@@ -438,7 +438,7 @@ TEST_F(ServerTest, ValidSingleRangeByteRangeRequestsAreHandledProperly)
     const auto p = zfs1_->GET(url, { {"Range", "bytes=0-10"} } );
     EXPECT_EQ(206, p->status);
     EXPECT_EQ("bytes 0-10/20077", p->get_header_value("Content-Range"));
-    EXPECT_EQ(11, p->body.size());
+    EXPECT_EQ(11U, p->body.size());
     EXPECT_EQ(full->body.substr(0, 11), p->body);
     EXPECT_EQ("bytes", p->get_header_value("Accept-Ranges"));
   }
@@ -447,7 +447,7 @@ TEST_F(ServerTest, ValidSingleRangeByteRangeRequestsAreHandledProperly)
     const auto p = zfs1_->GET(url, { {"Range", "bytes=123-456"} } );
     EXPECT_EQ(206, p->status);
     EXPECT_EQ("bytes 123-456/20077", p->get_header_value("Content-Range"));
-    EXPECT_EQ(334, p->body.size());
+    EXPECT_EQ(334U, p->body.size());
     EXPECT_EQ(full->body.substr(123, 334), p->body);
     EXPECT_EQ("bytes", p->get_header_value("Accept-Ranges"));
   }