[GitHub] csantanapr closed pull request #3723: Improve wget update command

[GitBox <gi...@apache.org>]

csantanapr closed pull request #3723: Improve wget update command
URL: https://github.com/apache/incubator-openwhisk/pull/3723
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/common/scala/Dockerfile b/common/scala/Dockerfile
index 5333390eed..02ec64b40c 100644
--- a/common/scala/Dockerfile
+++ b/common/scala/Dockerfile
@@ -19,7 +19,7 @@ ENV PATH $JAVA_HOME/bin:$PATH
 
 
 RUN apk upgrade --update && \
-    apk add --update libstdc++ curl ca-certificates bash sed wget&& \
+    apk add --update libstdc++ curl ca-certificates bash sed wget && \
     update-ca-certificates && \
     for pkg in glibc-${GLIBC_VERSION} glibc-bin-${GLIBC_VERSION} glibc-i18n-${GLIBC_VERSION}; do curl -sSL https://github.com/andyshinn/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/${pkg}.apk -o /tmp/${pkg}.apk; done && \
     apk add --allow-untrusted /tmp/*.apk && \
diff --git a/tools/travis/build.sh b/tools/travis/build.sh
deleted file mode 100755
index 2a03a48101..0000000000
--- a/tools/travis/build.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-set -e
-
-# Build script for Travis-CI.
-
-SCRIPTDIR=$(cd $(dirname "$0") && pwd)
-ROOTDIR="$SCRIPTDIR/../.."
-HOMEDIR="$SCRIPTDIR/../../../"
-UTILDIR="$HOMEDIR/incubator-openwhisk-utilities/"
-
-# clone the openwhisk utilities repo.
-cd $HOMEDIR
-git clone https://github.com/apache/incubator-openwhisk-utilities.git
-
-# run the scancode util. against project source code starting at its root
-cd $UTILDIR
-scancode/scanCode.py --config scancode/ASF-Release.cfg $ROOTDIR
-
-# run scalafmt checks
-cd $ROOTDIR
-TERM=dumb ./gradlew checkScalafmtAll
-
-# lint tests to all be actually runnable
-MISSING_TESTS=$(grep -rL "RunWith" --include="*Tests.scala" tests)
-if [ -n "$MISSING_TESTS" ]
-then
-  echo "The following tests are missing the 'RunWith' annotation"
-  echo $MISSING_TESTS
-  exit 1
-fi
-
-cd $ROOTDIR/ansible
-
-$ANSIBLE_CMD setup.yml -e mode=HA
-$ANSIBLE_CMD prereq.yml
-$ANSIBLE_CMD couchdb.yml
-$ANSIBLE_CMD initdb.yml
-$ANSIBLE_CMD apigateway.yml
-
-cd $ROOTDIR
-
-TERM=dumb ./gradlew distDocker -PdockerImagePrefix=testing $GRADLE_PROJS_SKIP
-
-cd $ROOTDIR/ansible
-
-$ANSIBLE_CMD wipe.yml
-$ANSIBLE_CMD openwhisk.yml
-
-cd $ROOTDIR
-cat whisk.properties
-TERM=dumb ./gradlew :tests:testCoverageLean :tests:reportCoverage
-
-cd $ROOTDIR/ansible
-$ANSIBLE_CMD logs.yml
-
-cd $ROOTDIR
-tools/build/checkLogs.py logs
-
-bash <(curl -s https://codecov.io/bash)


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services