Skip to content

Commit

Permalink
use the runtimes 'core' in runtimes.json
Browse files Browse the repository at this point in the history
  • Loading branch information
msciabarra committed Sep 16, 2023
1 parent b3621de commit bd05bc7
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 273 deletions.
12 changes: 8 additions & 4 deletions Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -118,7 +120,9 @@ tasks:
git push origin nuvolaris --tags
cd ../..
go get github.com/nuvolaris/[email protected].$NOW
git add tools/openwhisk-cli
git add tools/openwhisk-wskdeploy
git add go.mod go.sum
sync-task:
- |
Expand Down
5 changes: 4 additions & 1 deletion bin/nuvfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
265 changes: 0 additions & 265 deletions runtimes.json

This file was deleted.

2 changes: 1 addition & 1 deletion tools/openwhisk-cli
Submodule openwhisk-cli updated 2 files
+1 −1 go.mod
+2 −0 go.sum
2 changes: 1 addition & 1 deletion tools/openwhisk-wskdeploy

0 comments on commit bd05bc7

Please sign in to comment.