From bd05bc72173bff36b0711ae31ddecc85e7e72c79 Mon Sep 17 00:00:00 2001 From: Michele Sciabarra Date: Sat, 16 Sep 2023 12:07:06 +0100 Subject: [PATCH] use the runtimes 'core' in runtimes.json --- Taskfile.yml | 12 +- bin/nuvfile.yml | 5 +- go.mod | 3 +- go.sum | 4 + runtimes.json | 265 -------------------------------------- tools/openwhisk-cli | 2 +- tools/openwhisk-wskdeploy | 2 +- 7 files changed, 20 insertions(+), 273 deletions(-) delete mode 100644 runtimes.json diff --git a/Taskfile.yml b/Taskfile.yml index 6f06eb8..5909ca0 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -18,8 +18,8 @@ version: "3" vars: - BRANCH: 3.0.1 - BASEVER: "{{.BRANCH}}-beta" + BRANCH: 3.0.0 + BASEVER: "3.0.1-beta" VERSION: sh: git describe --tags --abbrev=0 2>/dev/null || git rev-parse --short HEAD S: "" @@ -67,7 +67,9 @@ tasks: test: desc: tests all cmds: - - curl -sL https://raw.githubusercontent.com/nuvolaris/olaris/{{.BRANCH}}/runtimes.json >runtimes.json + - > + curl -sL https://raw.githubusercontent.com/nuvolaris/olaris/{{.BRANCH}}/runtimes.json + | jq '{"runtimes": .runtimes}' >runtimes.json - task: install - task: utest - task: itest @@ -118,7 +120,9 @@ tasks: git push origin nuvolaris --tags cd ../.. go get github.com/nuvolaris/openwhisk-cli@v0.0.0.$NOW - + git add tools/openwhisk-cli + git add tools/openwhisk-wskdeploy + git add go.mod go.sum sync-task: - | diff --git a/bin/nuvfile.yml b/bin/nuvfile.yml index 17ddddb..4fa9ec7 100644 --- a/bin/nuvfile.yml +++ b/bin/nuvfile.yml @@ -180,7 +180,10 @@ tasks: nuv: dir: ".." cmds: - - curl -sL https://raw.githubusercontent.com/nuvolaris/olaris/{{.BRANCH}}/runtimes.json >runtimes.json + - > + curl -sL https://raw.githubusercontent.com/nuvolaris/olaris/{{.BRANCH}}/runtimes.json + | jq '{"runtimes": .runtimes}' + >runtimes.json - > GOOS={{.OS}} GOARCH={{.ARCH}} go build diff --git a/go.mod b/go.mod index d06e072..4a91eaa 100644 --- a/go.mod +++ b/go.mod @@ -31,7 +31,8 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/nuvolaris/goja v0.0.0-20230826141320-81daf86ddcc2 // indirect github.com/nuvolaris/goja_nodejs v0.0.0-20230908085513-c4634a0b1160 // indirect - github.com/nuvolaris/openwhisk-wskdeploy v0.0.0-20230915131310-1e795a4247d3 // indirect + github.com/nuvolaris/openwhisk-cli v0.0.0-20230916104949-fd9d71a5c1cc // indirect + github.com/nuvolaris/openwhisk-wskdeploy v0.0.0-20230916104531-c4bc982185e9 // indirect github.com/nuvolaris/sh/v3 v3.7.1-nuv.2309151614 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/remeh/sizedwaitgroup v1.0.0 // indirect diff --git a/go.sum b/go.sum index 40973d6..b029488 100644 --- a/go.sum +++ b/go.sum @@ -287,12 +287,16 @@ github.com/nuvolaris/goja_nodejs v0.0.0-20230527135110-3aa37178bb6c/go.mod h1:3j github.com/nuvolaris/goja_nodejs v0.0.0-20230826135643-676d5429636c/go.mod h1:bik1pvnsEagEp/uCTjjKUHVWPyuy53ETukJZVuaSG2U= github.com/nuvolaris/goja_nodejs v0.0.0-20230908085513-c4634a0b1160 h1:/PhIMFTHKYzupL5wnmwTKlqW2nrx+8GBs9gN82YW8Yw= github.com/nuvolaris/goja_nodejs v0.0.0-20230908085513-c4634a0b1160/go.mod h1:bik1pvnsEagEp/uCTjjKUHVWPyuy53ETukJZVuaSG2U= +github.com/nuvolaris/openwhisk-cli v0.0.0-20230916104949-fd9d71a5c1cc h1:OY/ilSLO3NJJiW3hkgYxvYv6NXuWbSK9PWUIhMVz7Qs= +github.com/nuvolaris/openwhisk-cli v0.0.0-20230916104949-fd9d71a5c1cc/go.mod h1:R6stAksLUjO4q1PWh1VXMBH+eGwCbEOloDa704aH/mA= github.com/nuvolaris/openwhisk-cli/commands v0.0.0-20230914211457-35b540a1ded7 h1:kvpT8vl5PEza3Fu8OZZjkCB6rC9r1ymIToOtytyTtUc= github.com/nuvolaris/openwhisk-cli/commands v0.0.0-20230914211457-35b540a1ded7/go.mod h1:aXJusnuxBX3WRX7aLrFPInwOrhAS31reOm+bHPYaDIs= github.com/nuvolaris/openwhisk-cli/wski18n v0.0.0-20230914211457-35b540a1ded7 h1:DVMDkKVsaSuKNA0psVWGug6lM978U3EvV3A01F/uK9k= github.com/nuvolaris/openwhisk-cli/wski18n v0.0.0-20230914211457-35b540a1ded7/go.mod h1:x57w2QArhPOdDEibanGlaQlYA/1PP4RNe5e21b+R9XA= github.com/nuvolaris/openwhisk-wskdeploy v0.0.0-20230915131310-1e795a4247d3 h1:6x1vY+BgLVdC/XnEXyCsqdsFnHvLsI5EUqKNwc1L9UI= github.com/nuvolaris/openwhisk-wskdeploy v0.0.0-20230915131310-1e795a4247d3/go.mod h1:Rx9BGhPmwoWToPAVFr/12P3W0JRYlxCH/xzCz6NeOQo= +github.com/nuvolaris/openwhisk-wskdeploy v0.0.0-20230916104531-c4bc982185e9 h1:CXCPlchX/Dq2BzaiuGnK9t2wR5z5UWQJF0IHcfIyxac= +github.com/nuvolaris/openwhisk-wskdeploy v0.0.0-20230916104531-c4bc982185e9/go.mod h1:Rx9BGhPmwoWToPAVFr/12P3W0JRYlxCH/xzCz6NeOQo= github.com/nuvolaris/sh/v3 v3.7.1-nuv.2309151537 h1:1VKfBIl+XUU5OqOGiQ4ZnGsZZ69ubZnh8UsTlYLs2ug= github.com/nuvolaris/sh/v3 v3.7.1-nuv.2309151537/go.mod h1:UQ2cf9TrM8j3WS8GUUxrwTC0nt2NWpApU21Kg31nkQ0= github.com/nuvolaris/sh/v3 v3.7.1-nuv.2309151614 h1:euD81WMIiFpBUfEUw7S8ODZ65zNwaM75dGUiyCK9+20= diff --git a/runtimes.json b/runtimes.json deleted file mode 100644 index aba489b..0000000 --- a/runtimes.json +++ /dev/null @@ -1,265 +0,0 @@ -{ - "description": [ - "This file describes the different languages (aka. managed action runtimes) supported by the system", - "as well as blackbox images that support the runtime specification.", - "Only actions with runtime families / kinds defined here can be created / read / updated / deleted / invoked.", - "Define a list of runtime families (example: 'nodejs') with at least one kind per family (example: 'nodejs:14').", - "Each runtime family needs a default kind (default: true).", - "When removing or renaming runtime families or runtime kinds from this file, preexisting actions", - "with the affected kinds can no longer be read / updated / deleted / invoked. In order to remove or rename", - "runtime families or runtime kinds, mark all affected runtime kinds as deprecated (deprecated: true) and", - "perform a manual migration of all affected actions.", - "", - "This file is meant to list all stable runtimes supported by the Apache Openwhisk community." - ], - "runtimes": { - "nodejs": [ - { - "kind": "nodejs:18", - "default": true, - "image": { - "prefix": "ghcr.io/nuvolaris", - "name": "action-nodejs-v18", - "tag": "3.0.0-beta.2309081459" - }, - "deprecated": false, - "attached": { - "attachmentName": "codefile", - "attachmentType": "text/plain" - }, - "stemCells": [ - { - "initialCount": 1, - "memory": "256 MB", - "reactive": { - "minCount": 1, - "maxCount": 4, - "ttl": "2 minutes", - "threshold": 1, - "increment": 1 - } - } - ] - }, - { - "kind": "nodejs:16", - "default": false, - "image": { - "prefix": "ghcr.io/nuvolaris", - "name": "action-nodejs-v16", - "tag": "3.0.0-beta.2309081459" - }, - "deprecated": false, - "attached": { - "attachmentName": "codefile", - "attachmentType": "text/plain" - } - } - ], - "python": [ - { - "kind": "python:3", - "default": true, - "image": { - "prefix": "ghcr.io/nuvolaris", - "name": "action-python-v311", - "tag": "3.0.0-beta.2309081459" - }, - "deprecated": false, - "attached": { - "attachmentName": "codefile", - "attachmentType": "text/plain" - }, - "stemCells": [ - { - "initialCount": 1, - "memory": "256 MB", - "reactive": { - "minCount": 1, - "maxCount": 4, - "ttl": "2 minutes", - "threshold": 1, - "increment": 1 - } - } - ] - }, - { - "kind": "python:310", - "default": false, - "image": { - "prefix": "ghcr.io/nuvolaris", - "name": "action-python-v310", - "tag": "3.0.0-beta.2309081459" - }, - "deprecated": false, - "attached": { - "attachmentName": "codefile", - "attachmentType": "text/plain" - } - } - ], - "java": [ - { - "kind": "java:8", - "default": true, - "image": { - "prefix": "ghcr.io/nuvolaris", - "name": "action-java-v8", - "tag": "0.3.0-morpheus.22110809" - }, - "deprecated": false, - "attached": { - "attachmentName": "codefile", - "attachmentType": "text/plain" - }, - "requireMain": true - } - ], - "php": [ - { - "kind": "php:7.3", - "default": false, - "deprecated": false, - "image": { - "prefix": "openwhisk", - "name": "action-php-v7.3", - "tag": "nightly" - }, - "attached": { - "attachmentName": "codefile", - "attachmentType": "text/plain" - } - }, - { - "kind": "php:7.4", - "default": true, - "deprecated": false, - "image": { - "prefix": "openwhisk", - "name": "action-php-v7.4", - "tag": "nightly" - }, - "attached": { - "attachmentName": "codefile", - "attachmentType": "text/plain" - } - }, - { - "kind": "php:8.0", - "default": false, - "deprecated": false, - "image": { - "prefix": "openwhisk", - "name": "action-php-v8.0", - "tag": "nightly" - }, - "attached": { - "attachmentName": "codefile", - "attachmentType": "text/plain" - } - } - ], - "ruby": [ - { - "kind": "ruby:2.5", - "default": true, - "deprecated": false, - "attached": { - "attachmentName": "codefile", - "attachmentType": "text/plain" - }, - "image": { - "prefix": "openwhisk", - "name": "action-ruby-v2.5", - "tag": "nightly" - } - } - ], - "go": [ - { - "kind": "go:1.17", - "default": true, - "deprecated": false, - "attached": { - "attachmentName": "codefile", - "attachmentType": "text/plain" - }, - "image": { - "prefix": "openwhisk", - "name": "action-golang-v1.17", - "tag": "nightly" - } - }, - { - "kind": "go:1.20mf", - "default": false, - "deprecated": false, - "attached": { - "attachmentName": "codefile", - "attachmentType": "text/plain" - }, - "image": { - "prefix": "ghcr.io/nuvolaris", - "name": "go-nuvolaris-metaflow", - "tag": "bc86ab6" - } - } - ], - "dotnet": [ - { - "kind": "dotnet:2.2", - "default": true, - "deprecated": false, - "requireMain": true, - "image": { - "prefix": "openwhisk", - "name": "action-dotnet-v2.2", - "tag": "nightly" - }, - "attached": { - "attachmentName": "codefile", - "attachmentType": "text/plain" - } - }, - { - "kind": "dotnet:3.1", - "default": false, - "deprecated": false, - "requireMain": true, - "image": { - "prefix": "openwhisk", - "name": "action-dotnet-v3.1", - "tag": "nightly" - }, - "attached": { - "attachmentName": "codefile", - "attachmentType": "text/plain" - } - } - ], - "rust": [ - { - "kind": "rust:1.34", - "default": true, - "image": { - "prefix": "openwhisk", - "name": "action-rust-v1.34", - "tag": "nightly" - }, - "deprecated": false, - "attached": { - "attachmentName": "codefile", - "attachmentType": "text/plain" - } - } - ] - }, - "blackboxes": [ - { - "prefix": "openwhisk", - "name": "dockerskeleton", - "tag": "nightly" - } - ] -} \ No newline at end of file diff --git a/tools/openwhisk-cli b/tools/openwhisk-cli index f453c18..fd9d71a 160000 --- a/tools/openwhisk-cli +++ b/tools/openwhisk-cli @@ -1 +1 @@ -Subproject commit f453c18f05a25512b3532b209015981a810adab9 +Subproject commit fd9d71a5c1cc8f4e8eb2ce6759b20f930aee25b4 diff --git a/tools/openwhisk-wskdeploy b/tools/openwhisk-wskdeploy index 1e795a4..c4bc982 160000 --- a/tools/openwhisk-wskdeploy +++ b/tools/openwhisk-wskdeploy @@ -1 +1 @@ -Subproject commit 1e795a4247d3fea2a3c53810e7f59f999ea27910 +Subproject commit c4bc982185e9e24939f93b8c10769c12245b1fe5