This is an automated email from the ASF dual-hosted git repository.
msciabarra pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openserverless-task.git
The following commit(s) were added to refs/heads/main by this push:
new d00667e nupdated prereq
d00667e is described below
commit d00667ed4c6efcdf37f6f30bdb3ace25aa5ffc5e
Author: Michele Sciabarra <[email protected]>
AuthorDate: Thu Aug 1 11:51:17 2024 +0200
nupdated prereq
---
nuvroot.json | 2 +-
prereq.yml | 36 ++++++++++++------------------------
2 files changed, 13 insertions(+), 25 deletions(-)
diff --git a/nuvroot.json b/nuvroot.json
index 618ed7f..c3d4823 100644
--- a/nuvroot.json
+++ b/nuvroot.json
@@ -2,7 +2,7 @@
"version": "0.1.0-2407311454.dev",
"config": {
"ops": {
- "coreutils": "arch b2sum b3sum base32 base64 basename basenc cat
chgrp chmod chown chroot cksum comm cp csplit cut date dd df dir dircolors
dirname du echo env expand expr factor false fmt fold groups hashsum head
hostid hostname id install join kill link ln logname ls md5sum mkdir mkfifo
mknod mktemp more mv nice nl nohup nproc numfmt od paste pathchk pinky pr
printenv printf ptx pwd readlink realpath rm rmdir seq sha1sum sha224sum
sha256sum sha3-224sum sha3-256sum sha3-384sum sha [...]
+ "coreutils": "arch b2sum b3sum base32 base64 basename basenc cat
chgrp chmod chown chroot cksum comm cp csplit cut date dd df dir dircolors
dirname du env expand expr factor fmt fold groups hashsum head hostid hostname
id install join kill link ln logname ls md5sum mkdir mkfifo mknod mktemp more
mv nice nl nohup nproc numfmt od paste pathchk pinky pr printenv printf ptx pwd
readlink realpath rm rmdir seq sha1sum sha224sum sha256sum sha3-224sum
sha3-256sum sha3-384sum sha3-512sum sh [...]
},
"images": {
"operator":
"sciabarracom/openserverless-operator:0.1.0-testing.2407271600"
diff --git a/prereq.yml b/prereq.yml
index a534f75..4859ed7 100644
--- a/prereq.yml
+++ b/prereq.yml
@@ -9,10 +9,6 @@ vars:
EXE: '{{if eq .OS "windows"}}.exe{{else}}{{end}}'
tasks:
-
- info:
- - echo "__ARCH={{.__ARCH}} BOH={{.BOH}}"
- - echo "OS={{.OS}} ARCH={{.ARCH}} ARC={{.ARC}} EXE={{.EXE}}"
download-and-extract:
requires:
@@ -20,21 +16,11 @@ tasks:
- FILE
- URL
- OUT
- vars:
- FILETAR: '{{trimSuffix ".gz" .FILE}}'
cmds:
- echo "{{.OUT}} {{.FILE}} {{.URL}} {{.FILETAR}}"
- curl -sL "{{.URL}}" -o {{.FILE}}
- - |
- {{if eq .OS "windows"}}
- 7zz e -r -aoa -o. "{{.FILE}}" "{{.OUT}}.exe"
- remove "{{.FILE}}"
- {{else}}
- 7zz e "{{.FILE}}" -o.
- remove "{{.FILE}}"
- 7zz e -r -aoa -o. "{{.FILETAR}}" "{{.OUT}}"
- remove "{{.FILETAR}}"
- {{end}}
+ - extract "{{.FILE}}" "{{.OUT}}{{.EXE}}"
+ - remove "{{.FILE}}"
download:
requires:
@@ -47,7 +33,7 @@ tasks:
- remove cookie.txt
7zz:
- desc: 7zr
+ desc: download 7zz
vars:
VERSION: "2407"
SUFFIX:
@@ -66,14 +52,14 @@ tasks:
- |
if test "{{.OS}}" == "windows"
then rename 7zr.exe 7zz.exe
- else tar xJvf "{{.FILE}}" 7zz
- remove "{{.FILE}}"
+ else extract "{{.FILE}}" 7zz
fi
coreutils:
- desc: coreutils
+ desc: download coreutils
vars:
# when changing this add the list of utilites to nuvroot.json in
config.ops.coreutils
+ # do NOT include [ test false true echo
VERSION: "0.0.27"
SUFFIX:
sh: |
@@ -96,7 +82,7 @@ tasks:
OUT: coreutils
bun:
- description: bun
+ desc: download bun
vars:
VERSION: "1.1.21"
ARCH2: '{{if eq .ARCH "amd64"}}x64{{else}}aarch64{{end}}'
@@ -105,10 +91,11 @@ tasks:
cmds:
- echo "{{.URL}}"
- curl -sL "{{.URL}}" -o "{{.FILE}}"
- - 7zz e -r -aoa -o. {{.FILE}} bun{{.EXE}}
+ - extract "{{.FILE}}" bun{{.EXE}}
- remove "{{.FILE}}"
kubectl:
+ desc: download kubectl
vars:
VERSION: v1.30.3
cmds:
@@ -118,6 +105,7 @@ tasks:
OUT: kubectl
kind:
+ desc: download bun
vars:
VERSION: 0.17.0
cmds:
@@ -127,6 +115,7 @@ tasks:
OUT: kind
k3sup:
+ desc: download k3sup
vars:
VERSION: 0.13.6
BASE: "https://github.com/alexellis/k3sup/releases/download/{{.VERSION}}";
@@ -151,5 +140,4 @@ tasks:
- task: bun
- task: kind
- task: k3sup
- # skipping this as it is slow to download
- #- task: kubectl
+ - task: kubectl
