You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by dg...@apache.org on 2020/01/21 19:43:37 UTC

[openwhisk-runtime-swift] branch master updated: build swift5.1 from released runtime-go v1.15.0 (#113)

This is an automated email from the ASF dual-hosted git repository.

dgrove pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk-runtime-swift.git


The following commit(s) were added to refs/heads/master by this push:
     new d9629dc  build swift5.1 from released runtime-go v1.15.0 (#113)
d9629dc is described below

commit d9629dc68e182bc8aff3516d9af7966fa6b51753
Author: David Grove <dg...@users.noreply.github.com>
AuthorDate: Tue Jan 21 14:43:29 2020 -0500

    build swift5.1 from released runtime-go v1.15.0 (#113)
    
    Switch to building actionloop proxy from 1.15.0 release.
    
    Also fix duplicate publish call in .travis.yml (cut & paste bug?)
---
 .travis.yml                   | 2 +-
 core/swift51Action/Dockerfile | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c8d0eab..4f46b6b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,7 +47,7 @@ deploy:
       branch: master
       repo: apache/openwhisk-runtime-swift
   - provider: script
-    script: "./tools/travis/publish.sh openwhisk 5.1 nightly && ./tools/travis/publish.sh openwhisk 5.1 nightly"
+    script: "./tools/travis/publish.sh openwhisk 5.1 nightly"
     on:
       branch: master
       repo: apache/openwhisk-runtime-swift
diff --git a/core/swift51Action/Dockerfile b/core/swift51Action/Dockerfile
index 2dc15e2..c6aa303 100644
--- a/core/swift51Action/Dockerfile
+++ b/core/swift51Action/Dockerfile
@@ -21,7 +21,7 @@ RUN env CGO_ENABLED=0 go get github.com/apache/openwhisk-runtime-go/main && mv /
 
 # or build it from a release
 FROM golang:1.12 AS builder_release
-ARG GO_PROXY_RELEASE_VERSION=golang1.12@1.14.0
+ARG GO_PROXY_RELEASE_VERSION=1.12@1.15.0
 RUN curl -sL \
   https://github.com/apache/openwhisk-runtime-go/archive/{$GO_PROXY_RELEASE_VERSION}.tar.gz\
   | tar xzf -\
@@ -31,7 +31,7 @@ RUN curl -sL \
 FROM swift:5.1.2
 
 # select the builder to use
-ARG GO_PROXY_BUILD_FROM=source
+ARG GO_PROXY_BUILD_FROM=release
 
 RUN rm -rf /var/lib/apt/lists/* && apt-get clean && apt-get -qq update \
 	&& apt-get install -y --no-install-recommends locales python3 vim libssl-dev libicu-dev \