bring cassandra back

AndreM102 · Sep 11, 2020 · c71140e · c71140e
1 parent 089959e
commit c71140e
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 14 deletions.
diff --git a/php/scripts/extensions.sh b/php/scripts/extensions.sh
@@ -105,20 +105,20 @@ else
     && docker-php-source delete
 fi
 
-# docker-php-source extract \
-#     && curl -L -o /tmp/cassandra-cpp-driver.deb "https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.14.0/cassandra-cpp-driver_2.14.0-1_amd64.deb" \
-#     && curl -L -o /tmp/cassandra-cpp-driver-dev.deb "https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.14.0/cassandra-cpp-driver-dev_2.14.0-1_amd64.deb" \
-#     && dpkg -i /tmp/cassandra-cpp-driver.deb /tmp/cassandra-cpp-driver-dev.deb \
-#     && rm /tmp/cassandra-cpp-driver.deb /tmp/cassandra-cpp-driver-dev.deb \
-#     && curl -L -o /tmp/cassandra.tar.gz "https://github.com/datastax/php-driver/archive/24d85d9f1d.tar.gz" \
-#     && mkdir /tmp/cassandra \
-#     && tar xfz /tmp/cassandra.tar.gz --strip 1 -C /tmp/cassandra \
-#     && rm -r /tmp/cassandra.tar.gz \
-#     && curl -L "https://github.com/datastax/php-driver/pull/135.patch" | patch -p1 -d /tmp/cassandra -i - \
-#     && mv /tmp/cassandra/ext /usr/src/php/ext/cassandra \
-#     && rm -rf /tmp/cassandra \
-#     && docker-php-ext-install cassandra \
-#     && docker-php-source delete
+docker-php-source extract \
+    && curl -L -o /tmp/cassandra-cpp-driver.deb "https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.14.0/cassandra-cpp-driver_2.14.0-1_amd64.deb" \
+    && curl -L -o /tmp/cassandra-cpp-driver-dev.deb "https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.14.0/cassandra-cpp-driver-dev_2.14.0-1_amd64.deb" \
+    && dpkg -i /tmp/cassandra-cpp-driver.deb /tmp/cassandra-cpp-driver-dev.deb \
+    && rm /tmp/cassandra-cpp-driver.deb /tmp/cassandra-cpp-driver-dev.deb \
+    && curl -L -o /tmp/cassandra.tar.gz "https://github.com/datastax/php-driver/archive/24d85d9f1d.tar.gz" \
+    && mkdir /tmp/cassandra \
+    && tar xfz /tmp/cassandra.tar.gz --strip 1 -C /tmp/cassandra \
+    && rm -r /tmp/cassandra.tar.gz \
+    && curl -L "https://github.com/datastax/php-driver/pull/135.patch" | patch -p1 -d /tmp/cassandra -i - \
+    && mv /tmp/cassandra/ext /usr/src/php/ext/cassandra \
+    && rm -rf /tmp/cassandra \
+    && docker-php-ext-install cassandra \
+    && docker-php-source delete
 
 if [[ $PHP_VERSION == "7.2" ]]; then
   docker-php-source extract \

diff --git a/tests/goss-7.2-3-lts.yaml b/tests/goss-7.2-3-lts.yaml
@@ -38,6 +38,7 @@ command:
       - bcmath
       - bz2
       - calendar
+      - cassandra
       - exif
       - gd
       - gmp

diff --git a/tests/goss-7.2.yaml b/tests/goss-7.2.yaml
@@ -42,6 +42,7 @@ command:
       - bcmath
       - bz2
       - calendar
+      - cassandra
       - exif
       - gd
       - gmp

diff --git a/tests/goss-7.3.yaml b/tests/goss-7.3.yaml
@@ -42,6 +42,7 @@ command:
       - bcmath
       - bz2
       - calendar
+      - cassandra
       - exif
       - gd
       - gmp

diff --git a/tests/goss-7.4.yaml b/tests/goss-7.4.yaml
@@ -42,6 +42,7 @@ command:
       - bcmath
       - bz2
       - calendar
+      - cassandra
       - exif
       - gd
       - gmp

diff --git a/tests/goss-lts.yaml b/tests/goss-lts.yaml
@@ -42,6 +42,7 @@ command:
       - bcmath
       - bz2
       - calendar
+      - cassandra
       - exif
       - gd
       - gmp
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,6 +38,7 @@ command: @@
           - bcmath
           - bz2
           - calendar
+          - cassandra
           - exif
           - gd
           - gmp
@@ Expand Down @@