You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by ja...@apache.org on 2019/01/09 17:31:20 UTC
[incubator-openwhisk-wskdeploy] branch master updated: add swift
4.2 (#1022)
This is an automated email from the ASF dual-hosted git repository.
japetrsn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-wskdeploy.git
The following commit(s) were added to refs/heads/master by this push:
new d4eeea3 add swift 4.2 (#1022)
d4eeea3 is described below
commit d4eeea31ab2335ca195400b943cc78e3845d2738
Author: Carlos Santana <cs...@apache.org>
AuthorDate: Wed Jan 9 12:31:13 2019 -0500
add swift 4.2 (#1022)
---
runtimes/runtimes.go | 16 +++++++++++++++-
specification/html/spec_actions.md | 5 +++--
tests/src/integration/runtimetests/manifest.yaml | 20 ++++++++++++++++++++
3 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/runtimes/runtimes.go b/runtimes/runtimes.go
index 39236ad..843ba00 100644
--- a/runtimes/runtimes.go
+++ b/runtimes/runtimes.go
@@ -426,7 +426,7 @@ var RUNTIME_DETAILS = []byte(`{
},
{
"kind": "swift:4.1",
- "default": true,
+ "default": false,
"image": {
"prefix": "openwhisk",
"name": "action-swift-v4.1",
@@ -437,6 +437,20 @@ var RUNTIME_DETAILS = []byte(`{
"attachmentName": "codefile",
"attachmentType": "text/plain"
}
+ },
+ {
+ "kind": "swift:4.2",
+ "default": true,
+ "image": {
+ "prefix": "openwhisk",
+ "name": "action-swift-v4.2",
+ "tag": "latest"
+ },
+ "deprecated": false,
+ "attached": {
+ "attachmentName": "codefile",
+ "attachmentType": "text/plain"
+ }
}
],
"java": [
diff --git a/specification/html/spec_actions.md b/specification/html/spec_actions.md
index 285266b..d3ad8e6 100644
--- a/specification/html/spec_actions.md
+++ b/specification/html/spec_actions.md
@@ -144,8 +144,9 @@ These packages may vary by OpenWhisk release; examples of supported runtimes as
| python@3 | python:3 | openwhisk/python3action:latest | Latest Python 3 language runtime |
| python, python@2 | python:2 | openwhisk/python2action:latest | Latest Python 2 language runtime |s
| ruby | ruby:2.5 | openwhisk/action-ruby-v2.5:latest | Latest Ruby 2.5 language runtime |
-| swift@4.1 | swift | openwhisk/action-swift-v4.1:latest | Latest Swift 4.1 language runtime |
-| swift@3.1.1 | swift | openwhisk/action-swift-v3.1.1:latest | Latest Swift 3.1.1 language runtime |
+| swift@4.2 | swift:4.2 | openwhisk/action-swift-v4.2:latest | Latest Swift 4.2 language runtime |
+| swift@4.1 | swift:4.1 | openwhisk/action-swift-v4.1:latest | Latest Swift 4.1 language runtime |
+| swift@3.1.1 | swift:3.1.1 | openwhisk/action-swift-v3.1.1:latest | Latest Swift 3.1.1 language runtime |
| dotnet, dotnet@2.2 | dotnet:2.2 | openwhisk/action-dotnet-v2.2:latest | Latest .NET Core 2.2 runtime |
| language:default | N/A | N/A | Permit the OpenWhisk platform to select the correct default language runtime. |
diff --git a/tests/src/integration/runtimetests/manifest.yaml b/tests/src/integration/runtimetests/manifest.yaml
index c0b6803..6d42255 100644
--- a/tests/src/integration/runtimetests/manifest.yaml
+++ b/tests/src/integration/runtimetests/manifest.yaml
@@ -116,6 +116,26 @@ packages:
place: string
outputs:
payload: string
+ greetingswift41-with-explicit-runtime:
+ web-export: true
+ version: 1.0
+ function: src/hello.swift
+ runtime: swift:4.1
+ inputs:
+ name: string
+ place: string
+ outputs:
+ payload: string
+ greetingswift42-with-explicit-runtime:
+ web-export: true
+ version: 1.0
+ function: src/hello.swift
+ runtime: swift:4.2
+ inputs:
+ name: string
+ place: string
+ outputs:
+ payload: string
helloworldjava-with-explicit-runtime:
function: src/hello.jar
runtime: java