This is an automated email from the ASF dual-hosted git repository. msciabarra pushed a commit to branch fix-spaces-in-windows in repository https://gitbox.apache.org/repos/asf/openserverless-task.git
commit 0474f111118b50a893436bf03729087dba30ed0d Author: Michele Sciabarra <[email protected]> AuthorDate: Fri Aug 15 12:08:33 2025 +0200 fix spaces --- env/secrets/bun.lockb | Bin ide/deploy/bun.lockb | Bin prereq.yml | 28 +++++++++++++----- setup/docker/opsfile.yml | 4 +-- setup/opsfile.yml | 59 ++++++++++++++++++------------------- util/config/configurator/bun.lockb | Bin util/upload/bun.lockb | Bin 7 files changed, 52 insertions(+), 39 deletions(-) diff --git a/env/secrets/bun.lockb b/env/secrets/bun.lockb old mode 100755 new mode 100644 diff --git a/ide/deploy/bun.lockb b/ide/deploy/bun.lockb old mode 100755 new mode 100644 diff --git a/prereq.yml b/prereq.yml index 0c0b4d5..181afa5 100644 --- a/prereq.yml +++ b/prereq.yml @@ -176,10 +176,21 @@ tasks: URL: "https://github.com/astral-sh/uv/releases/download/{{.VERSION}}/{{.FILE}}"; OUT: uv cmds: - - curl -sL "{{.URL}}" -o "{{.FILE}}" + - curl -sL "{{.URL}}" -o "{{.FILE}}" - extract "{{.FILE}}" "{{.OUT}}{{.EXE}}" - remove "{{.FILE}}" + yq: + desc: install yq + vars: + VERSION: "4.47.1" + FILE: "yq_{{.OS}}_{{.ARCH}}{{.EXE}}" + URL: "https://github.com/mikefarah/yq/releases/download/v{{.VERSION}}/{{.FILE}}"; + OUT: yq + cmds: + - curl -sL "{{.URL}}" -o "{{.OUT}}" + - executable "{{.OUT}}" + #hugo: # desc: download hugo # vars: @@ -312,7 +323,10 @@ tasks: - task: uv - task: helm - task: kubefwd - - task: zip + - task: yq + # do not test zip as it is a special case + #- task: zip + # commented out for now #- task: hugo #- task: k3d @@ -321,10 +335,10 @@ tasks: DIR: "{{.OPS_PWD}}/bin/{{.OS}}-{{.ARCH}}" cmds: - | - {{.DRY}} rm -Rvf {{.DIR}} - mkdir -p {{.DIR}} - cd {{.DIR}} - {{.DRY}} ops -task -t ../../prereq.yml -d {{.DIR}} all + {{.DRY}} rm -Rvf "{{.DIR}}" + mkdir -p "{{.DIR}}" + cd "{{.DIR}}" + {{.DRY}} ops -task -t ../../prereq.yml -d "{{.DIR}}" all - task: check check: @@ -344,7 +358,7 @@ tasks: - false cmds: - for: sources - cmd: filetype -m {{.ITEM}} | rg {{.FILETYPE}} + cmd: filetype -m "{{.ITEM}}" | rg {{.FILETYPE}} tests: - __OS=linux __ARCH=amd64 ops -task -t prereq.yml test diff --git a/setup/docker/opsfile.yml b/setup/docker/opsfile.yml index 9b692ec..b40122c 100644 --- a/setup/docker/opsfile.yml +++ b/setup/docker/opsfile.yml @@ -60,7 +60,7 @@ tasks: cluster: silent: true cmds: - - mkdir -p $DATADIR + - mkdir -p "$DATADIR" - envsubst -i kind.yaml -o _kind.yaml - > kind create cluster @@ -89,7 +89,7 @@ tasks: - config SKIP_PRELOAD_IMAGES cmds: - | - for image in "$IMAGES_SYSTEMAPI" "$IMAGES_STREAMER" "$IMAGES_OPERATOR" "$IMAGES_CONTROLLER" + for image in "$IMAGES_STREAMER" "$IMAGES_OPERATOR" "$IMAGES_CONTROLLER" do docker pull "$image" --platform "linux/{{ARCH}}" if ! kind load docker-image "$image" --name nuvolaris diff --git a/setup/opsfile.yml b/setup/opsfile.yml index b8c58f0..16985b5 100644 --- a/setup/opsfile.yml +++ b/setup/opsfile.yml @@ -107,36 +107,35 @@ tasks: fi fi fi - - $OPS setup docker check-space - - $OPS config slim - - $OPS setup devcluster - - $OPS setup nuvolaris streamer deploy - - $OPS setup nuvolaris system-api deploy - - $OPS setup nuvolaris add-user + - ops setup docker check-space + - ops config slim + - ops config apihost miniops.me --protocol=http + - ops setup devcluster + - ops setup nuvolaris streamer deploy + - ops setup nuvolaris add-user devcluster: vars: PORTS: '9010/tcp 9080/tcp 30379/tcp 32817/tcp 3232/tcp 3233/tcp 9644/tcp 7896/tcp 5984/tcp 9092/tcp 9000/tcp 9090/tcp 19530/tcp 9091/tcp, 27017/tcp 80/tcp 443/tcp 57817/tcp' silent: true cmds: - - $OPS config apihost miniops.me --protocol=http - | if {{.__status}} - then {{.RUN}} $OPS setup docker status + then {{.RUN}} ops setup docker status elif {{.__uninstall}} - then {{.RUN}} $OPS setup docker delete + then {{.RUN}} ops setup docker delete else if test -z {{.__skip_check_ports}} then task check-ports PORTS="{{ .PORTS }}" fi - {{.RUN}} $OPS setup docker create + {{.RUN}} ops setup docker create if test -z {{.__skip_preload_images}} then - {{.RUN}} $OPS setup docker preload + {{.RUN}} ops setup docker preload fi - {{.RUN}} $OPS setup kubernetes create - {{.RUN}} $OPS setup nuvolaris login + {{.RUN}} ops setup kubernetes create + {{.RUN}} ops setup nuvolaris login config STATUS_LAST=devcluster fi @@ -145,12 +144,12 @@ tasks: cmds: - | if {{.__status}} - then {{.RUN}} $OPS setup kubernetes status CONTEXT="{{._context_}}" + then {{.RUN}} ops setup kubernetes status CONTEXT="{{._context_}}" elif {{.__uninstall}} - then {{.RUN}} $OPS setup kubernetes delete CONTEXT="{{._context_}}" + then {{.RUN}} ops setup kubernetes delete CONTEXT="{{._context_}}" else - {{.RUN}} $OPS setup kubernetes create CONTEXT="{{._context_}}" - {{.RUN}} $OPS setup nuvolaris login + {{.RUN}} ops setup kubernetes create CONTEXT="{{._context_}}" + {{.RUN}} ops setup nuvolaris login config STATUS_LAST=cluster if test -n "{{._context_}}" then config STATUS_CONTEXT="{{._context_}}" @@ -162,13 +161,13 @@ tasks: cmds: - | if {{.__status}} - then {{.RUN}} $OPS cloud k3s status {{._server_}} {{._user_}} + then {{.RUN}} ops cloud k3s status {{._server_}} {{._user_}} elif {{.__uninstall}} - then {{.RUN}} $OPS cloud k3s delete {{._server_}} {{._user_}} + then {{.RUN}} ops cloud k3s delete {{._server_}} {{._user_}} else - {{.RUN}} $OPS cloud k3s create {{._server_}} {{._user_}} - {{.RUN}} $OPS setup kubernetes create - {{.RUN}} $OPS setup nuvolaris login + {{.RUN}} ops cloud k3s create {{._server_}} {{._user_}} + {{.RUN}} ops setup kubernetes create + {{.RUN}} ops setup nuvolaris login config STATUS_LAST=server STATUS_SERVER="{{._server_}}" if test -n "{{._user_}}" then config STATUS_USERNAME="{{._user_}}" @@ -180,9 +179,9 @@ tasks: cmds: - | case "$STATUS_LAST" in - (devcluster) {{.RUN}} $OPS setup devcluster --status ;; - (cluster) {{.RUN}} $OPS setup cluster "$STATUS_CONTEXT" --status ;; - (server) {{.RUN}} $OPS setup server "$STATUS_SERVER" "$STATUS_USERNAME" --status ;; + (devcluster) {{.RUN}} ops setup devcluster --status ;; + (cluster) {{.RUN}} ops setup cluster "$STATUS_CONTEXT" --status ;; + (server) {{.RUN}} ops setup server "$STATUS_SERVER" "$STATUS_USERNAME" --status ;; (*) echo nothing installed yet esac @@ -192,25 +191,25 @@ tasks: - | case "$STATUS_LAST" in (devcluster) - {{.RUN}} $OPS setup devcluster --uninstall + {{.RUN}} ops setup devcluster --uninstall config -r STATUS_LAST ;; (cluster) if test -n "$STATUS_CONTEXT" then - {{.RUN}} $OPS setup cluster "$STATUS_CONTEXT" --uninstall + {{.RUN}} ops setup cluster "$STATUS_CONTEXT" --uninstall config -r STATUS_CONTEXT else - {{.RUN}} $OPS setup cluster --uninstall + {{.RUN}} ops setup cluster --uninstall fi config -r STATUS_LAST ;; (server) if test -z "$STATUS_USERNAME" then - {{.RUN}} $OPS setup server "$STATUS_SERVER" --uninstall + {{.RUN}} ops setup server "$STATUS_SERVER" --uninstall else - {{.RUN}} $OPS setup server "$STATUS_SERVER" "$STATUS_USERNAME" --uninstall + {{.RUN}} ops setup server "$STATUS_SERVER" "$STATUS_USERNAME" --uninstall config -r STATUS_USERNAME fi config -r STATUS_LAST STATUS_SERVER diff --git a/util/config/configurator/bun.lockb b/util/config/configurator/bun.lockb old mode 100755 new mode 100644 diff --git a/util/upload/bun.lockb b/util/upload/bun.lockb old mode 100755 new mode 100644
