Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix runtimes kind go version update #1151

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# Whisk Deploy `wskdeploy`

[![License](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0)
[![Build Status](https://travis-ci.com/apache/openwhisk-wskdeploy.svg?branch=master)](https://travis-ci.com/apache/openwhisk-wskdeploy)
[![Build Status](https://travis-ci.com/apache/openwhisk-wskdeploy.svg?branch=master)](https://travis-ci.com/github/apache/openwhisk-wskdeploy)

`wskdeploy` is a utility to help you describe and deploy any part of the OpenWhisk programming model using a YAML manifest file. Use it to deploy all of your OpenWhisk project's [Packages](https://github.com/apache/openwhisk/blob/master/docs/packages.md), [Actions](https://github.com/apache/openwhisk/blob/master/docs/actions.md), [Triggers, and Rules](https://github.com/apache/openwhisk/blob/master/docs/triggers_rules.md), together, using a single command!

Expand Down
4 changes: 2 additions & 2 deletions runtimes/runtimes.go
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ var RUNTIME_DETAILS = []byte(`{
],
"swift": [
{
"kind": "swift:4.2",
"kind": "swift:5.4",
"default": true,
"image": {
"prefix": "openwhisk",
Expand Down Expand Up @@ -461,7 +461,7 @@ var RUNTIME_DETAILS = []byte(`{
],
"go": [
{
"kind": "go:1.11",
"kind": "go:1.15",
"default": true,
"deprecated": false,
"attached": {
Expand Down
2 changes: 2 additions & 0 deletions specification/html/spec_actions.md
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ The following runtime values are currently supported by the OpenWhisk platform "

| Runtime value | OpenWhisk kind | Docker image | Tag | Description |
|:---|:---|:---|:---|:---|
| go | go:1.15 (default)| go:1.15 | [openwhisk/action-golang-v1.15](https://hub.docker.com/r/openwhisk/action-golang-v1.15) | nightly | Go 1.15 runtime |
| go | go:1.11 (default)| go:1.11 | [openwhisk/action-golang-v1.11](https://hub.docker.com/r/openwhisk/action-golang-v1.11) | nightly | Go 1.11 runtime |
| nodejs@12 | nodejs:12 | [openwhisk/nodejs12action](https://hub.docker.com/r/openwhisk/action-nodejs-v12) | nightly | NodeJS 12 runtime |
| nodejs | nodejs@10 (default)| nodejs:10 | [openwhisk/action-nodejs-v10](https://hub.docker.com/r/openwhisk/action-nodejs-v10) | nightly |NodeJS 10 runtime |
Expand All @@ -166,6 +167,7 @@ The following runtime values are currently supported by the OpenWhisk platform "
| python | python@3 (default) | python:3 | [openwhisk/python3action](https://hub.docker.com/r/openwhisk/python3action) | nightly | Python 3 (3.6) language runtime |
| python@2 | python:2 | [openwhisk/python2action](https://hub.docker.com/r/openwhisk/python2action) | 1.13.0-incubating | Python 2 (2.7) language runtime |
| ruby | (default) | ruby:2.5 | [openwhisk/action-ruby-v2.5](https://hub.docker.com/repository/docker/openwhisk/action-ruby-v2.5) | nightly | Ruby 2.5 language runtime |
| swift | [email protected] (default) | swift:5.4 | [openwhisk/action-swift-v5.4](https://hub.docker.com/r/openwhisk/action-swift-v5.4) | nightly | Swift 4.2 language runtime |
| swift | [email protected] (default) | swift:4.2 | [openwhisk/action-swift-v4.2](https://hub.docker.com/r/openwhisk/action-swift-v4.2) | nightly | Swift 4.2 language runtime |
| [email protected] | swift:4.1 | [openwhisk/action-swift-v4.1](https://hub.docker.com/r/openwhisk/action-swift-v4.1) | nightly | Swift 4.1 language runtime |
| [email protected] **(deprecated)** | swift:3.1.1 | [openwhisk/action-swift-v3.1.1](https://hub.docker.com/r/openwhisk/action-swift-v3.1.1) | nightly | Swift 3.1.1 language runtime |
Expand Down
4 changes: 2 additions & 2 deletions tests/src/integration/helloworld/manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ packages:
# helloworld action in swift
helloSwift:
function: actions/hello.swift
runtime: swift:4.2
runtime: swift:5.4
inputs:
name:
type: string
Expand All @@ -144,7 +144,7 @@ packages:
print (msg)
return msg
}
runtime: swift:4.2
runtime: swift:5.4
inputs:
name:
type: string
Expand Down
6 changes: 3 additions & 3 deletions tests/src/integration/runtimetests/manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ packages:
web-export: true
version: 1.0
function: src/hello.swift
runtime: swift:4.2
runtime: swift:5.4
inputs:
name: string
place: string
Expand Down Expand Up @@ -345,12 +345,12 @@ packages:
helloworldjava-with-swift-explicit-runtime:
function: src/hello.jar
main: Hello
runtime: swift:4.2
runtime: swift:5.4
helloworldjava-with-random-explicit-runtime:
function: src/hello.jar
main: Hello
runtime: random
helloworlddotnet22-with-swift-explicit-runtime:
function: src/helloDotNet.zip
main: Apache.OpenWhisk.Example.Dotnet::Apache.OpenWhisk.Example.Dotnet.Hello::Main
runtime: swift:4.2
runtime: swift:5.4