travis-ci: remove unused files

PATCH In review Ilya Shipitsin 3 participants 3 messages Mar 5, 2017 – Mar 12, 2017

Share & tools

Ilya Shipitsin

author

2017-03-05 17:21 UTC #0 lore raw

PATCH 1/1 travis-ci: remove unused files

Those files were commited by mistake. I implemented building dependencies in 4 separate scripts, later Steffan Karger combined all 4 scripts into "build-deps.sh".

Signed-off-by Ilya Shipitsin <[email protected]...>

---
 .travis/build-mbedtls-linux.sh |  9 ---------
 .travis/build-mbedtls-osx.sh   |  9 ---------
 .travis/build-openssl-linux.sh | 12 ------------
 .travis/build-openssl-osx.sh   | 11 -----------
 4 files changed, 41 deletions(-)
 delete mode 100755 .travis/build-mbedtls-linux.sh
 delete mode 100755 .travis/build-mbedtls-osx.sh
 delete mode 100755 .travis/build-openssl-linux.sh
 delete mode 100755 .travis/build-openssl-osx.sh

.travis/build-mbedtls-linux.sh deleted +0 -9

deleted file mode 100755
index dc92aaf..0000000
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if [ ! -f download-cache/mbedtls-${MBEDTLS_VERSION}-apache.tgz ]; then
-	wget -O download-cache/mbedtls-${MBEDTLS_VERSION}-apache.tgz https://tls.mbed.org/download/mbedtls-${MBEDTLS_VERSION}-apache.tgz;
-fi
-
-tar zxf download-cache/mbedtls-${MBEDTLS_VERSION}-apache.tgz
-cd mbedtls-${MBEDTLS_VERSION} && make > build.log 2>&1 || (cat build.log && exit 1)
-make install DESTDIR=$MBEDTLS_PREFIX && cd ..

.travis/build-mbedtls-osx.sh deleted +0 -9

deleted file mode 100755
index dc92aaf..0000000
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if [ ! -f download-cache/mbedtls-${MBEDTLS_VERSION}-apache.tgz ]; then
-	wget -O download-cache/mbedtls-${MBEDTLS_VERSION}-apache.tgz https://tls.mbed.org/download/mbedtls-${MBEDTLS_VERSION}-apache.tgz;
-fi
-
-tar zxf download-cache/mbedtls-${MBEDTLS_VERSION}-apache.tgz
-cd mbedtls-${MBEDTLS_VERSION} && make > build.log 2>&1 || (cat build.log && exit 1)
-make install DESTDIR=$MBEDTLS_PREFIX && cd ..

.travis/build-openssl-linux.sh deleted +0 ~~-12~~

deleted file mode 100755
index 84f4aae..0000000
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-if [ ! -f download-cache/openssl-${OPENSSL_VERSION}.tar.gz ]; then
-	wget -O download-cache/openssl-${OPENSSL_VERSION}.tar.gz https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz;
-fi
-
-tar zxf download-cache/openssl-${OPENSSL_VERSION}.tar.gz
-cd openssl-${OPENSSL_VERSION}/
-./config shared --prefix=$OPENSSL_PREFIX -DPURIFY > build.log 2>&1 || (cat build.log && exit 1)
-make > build.log 2>&1 || (cat build.log && exit 1)
-make install_sw > build.log 2>&1 || (cat build.log && exit 1)
-cd ..

.travis/build-openssl-osx.sh deleted +0 ~~-11~~

deleted file mode 100755
index 61c8016..0000000
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-if [ ! -f download-cache/openssl-${OPENSSL_VERSION}.tar.gz ]; then
-        wget -O download-cache/openssl-${OPENSSL_VERSION}.tar.gz https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz;
-fi
-
-tar zxf download-cache/openssl-${OPENSSL_VERSION}.tar.gz
-cd openssl-${OPENSSL_VERSION}/
-./Configure darwin64-x86_64-cc shared --prefix=$OPENSSL_PREFIX -DPURIFY > build.log 2>&1 || (cat build.log && exit 1)
-make depend install > build.log 2>&1 || (cat build.log && exit 1)
-cd ..

Signature · 1 line

2.5.5

Steffan Karger

2017-03-11 11:22 UTC #1 lore raw

Quoted 72 lines · Ilya Shipitsin

Those files were commited by mistake. I implemented building dependencies in 4 separate scripts, later Steffan Karger combined all 4 scripts into "build-deps.sh".

Signed-off-by Ilya Shipitsin <[email protected]...>

---
 .travis/build-mbedtls-linux.sh |  9 ---------
 .travis/build-mbedtls-osx.sh   |  9 ---------
 .travis/build-openssl-linux.sh | 12 ------------
 .travis/build-openssl-osx.sh   | 11 -----------
 4 files changed, 41 deletions(-)
 delete mode 100755 .travis/build-mbedtls-linux.sh
 delete mode 100755 .travis/build-mbedtls-osx.sh
 delete mode 100755 .travis/build-openssl-linux.sh
 delete mode 100755 .travis/build-openssl-osx.sh

.travis/build-mbedtls-linux.sh deleted +0 -9

deleted file mode 100755
index dc92aaf..0000000
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if [ ! -f download-cache/mbedtls-${MBEDTLS_VERSION}-apache.tgz ]; then
-	wget -O download-cache/mbedtls-${MBEDTLS_VERSION}-apache.tgz https://tls.mbed.org/download/mbedtls-${MBEDTLS_VERSION}-apache.tgz;
-fi
-
-tar zxf download-cache/mbedtls-${MBEDTLS_VERSION}-apache.tgz
-cd mbedtls-${MBEDTLS_VERSION} && make > build.log 2>&1 || (cat build.log && exit 1)
-make install DESTDIR=$MBEDTLS_PREFIX && cd ..

.travis/build-mbedtls-osx.sh deleted +0 -9

deleted file mode 100755
index dc92aaf..0000000
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if [ ! -f download-cache/mbedtls-${MBEDTLS_VERSION}-apache.tgz ]; then
-	wget -O download-cache/mbedtls-${MBEDTLS_VERSION}-apache.tgz https://tls.mbed.org/download/mbedtls-${MBEDTLS_VERSION}-apache.tgz;
-fi
-
-tar zxf download-cache/mbedtls-${MBEDTLS_VERSION}-apache.tgz
-cd mbedtls-${MBEDTLS_VERSION} && make > build.log 2>&1 || (cat build.log && exit 1)
-make install DESTDIR=$MBEDTLS_PREFIX && cd ..

.travis/build-openssl-linux.sh deleted +0 ~~-12~~

deleted file mode 100755
index 84f4aae..0000000
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-if [ ! -f download-cache/openssl-${OPENSSL_VERSION}.tar.gz ]; then
-	wget -O download-cache/openssl-${OPENSSL_VERSION}.tar.gz https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz;
-fi
-
-tar zxf download-cache/openssl-${OPENSSL_VERSION}.tar.gz
-cd openssl-${OPENSSL_VERSION}/
-./config shared --prefix=$OPENSSL_PREFIX -DPURIFY > build.log 2>&1 || (cat build.log && exit 1)
-make > build.log 2>&1 || (cat build.log && exit 1)
-make install_sw > build.log 2>&1 || (cat build.log && exit 1)
-cd ..

.travis/build-openssl-osx.sh deleted +0 -1

deleted file mode 100755
index 61c8016..0000000
@@ -1,11 +0,0 @@
-#!/bin/sh

.travis/build-openssl-osx.sh line 11

Quoted 10 lines

.travis/build-openssl-osx.sh deleted +0 ~~-10~~

-
-if [ ! -f download-cache/openssl-${OPENSSL_VERSION}.tar.gz ]; then
-        wget -O download-cache/openssl-${OPENSSL_VERSION}.tar.gz https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz;
-fi
-
-tar zxf download-cache/openssl-${OPENSSL_VERSION}.tar.gz
-cd openssl-${OPENSSL_VERSION}/
-./Configure darwin64-x86_64-cc shared --prefix=$OPENSSL_PREFIX -DPURIFY > build.log 2>&1 || (cat build.log && exit 1)
-make depend install > build.log 2>&1 || (cat build.log && exit 1)
-cd ..

ACK

-Steffan

Gert Doering

2017-03-12 18:23 UTC #2 lore raw

In reply to Ilya Shipitsin

Your patch has been applied to the master and release/2.4 branch.

commit 85ac77c90bba0a912625ad6926a9595c3192f902 (master) commit 39e847e0c002b0d08bb3612e1b67e74369debf63 (release/2.4)

Author: Ilya Shipitsin
Date:   Sun Mar 5 20:21:32 2017 +0300

     travis-ci: remove unused files

     Signed-off-by: Ilya Shipitsin <[email protected]...>
     Acked-by: Steffan Karger <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg14234.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering