[GitHub] jasonpet closed pull request #1022: add swift 4.2

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

jasonpet closed pull request #1022: add swift 4.2
URL: https://github.com/apache/incubator-openwhisk-wskdeploy/pull/1022
 
 
   

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/runtimes/runtimes.go b/runtimes/runtimes.go
index 39236ad0..843ba00e 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 285266bb..d3ad8e6d 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 c0b68039..6d422554 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


 

----------------------------------------------------------------
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