From c8d9a1989fd91f70cf0d13d6a7a173888fb92c66 Mon Sep 17 00:00:00 2001 From: Riccardo La Malfa Date: Sat, 24 Jan 2026 18:07:09 +0100 Subject: [PATCH] fix: restore kubefwd download link --- prereq.yml | 84 +++++++++++++++++++++++++++--------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/prereq.yml b/prereq.yml index 6bc8edd..223f89e 100644 --- a/prereq.yml +++ b/prereq.yml @@ -8,15 +8,15 @@ vars: DRY: "" tasks: - + download-and-extract: requires: - vars: + vars: - FILE - URL - OUT cmds: - - echo "{{.OUT}} {{.FILE}} {{.URL}} {{.FILETAR}}" + - echo "{{.OUT}} {{.FILE}} {{.URL}} {{.FILETAR}}" - curl -sL "{{.URL}}" -o {{.FILE}} - extract "{{.FILE}}" "{{.OUT}}{{.EXE}}" - remove "{{.FILE}}" @@ -48,7 +48,7 @@ tasks: cmds: - curl -sL "{{.URL}}" -o "{{.FILE}}" - | - if test "{{.OS}}" == "windows" + if test "{{.OS}}" == "windows" then rename 7zr.exe 7zz.exe else extract "{{.FILE}}" 7zz fi @@ -66,11 +66,11 @@ tasks: linux-amd64) echo "x86_64-unknown-linux-gnu" ;; linux-arm64) echo "aarch64-unknown-linux-gnu" ;; darwin-amd64) echo "x86_64-apple-darwin" ;; - darwin-arm64) echo "aarch64-apple-darwin" ;; + darwin-arm64) echo "aarch64-apple-darwin" ;; windows-*) echo "x86_64-pc-windows-gnu" ;; *) echo "unknown" ;; esac - URL: "https://github.com/uutils/coreutils/releases/download/{{.VERSION}}/coreutils-{{.VERSION}}-{{.SUFFIX}}{{.ARC}}" + URL: "https://github.com/uutils/coreutils/releases/download/{{.VERSION}}/coreutils-{{.VERSION}}-{{.SUFFIX}}{{.ARC}}" FILE: "{{base .URL}}" OUT: coreutils cmds: @@ -106,7 +106,7 @@ tasks: kind: desc: download kind vars: - VERSION: 0.29.0 + VERSION: 0.30.0 cmds: - task: download vars: @@ -118,7 +118,7 @@ tasks: vars: VERSION: 0.13.6 BASE: "https://github.com/alexellis/k3sup/releases/download/{{.VERSION}}" - FILE: + FILE: sh: | case {{.OS}}-{{.ARCH}} in (linux-amd64) echo k3sup ;; @@ -132,7 +132,7 @@ tasks: vars: URL: "{{.BASE}}/{{.FILE}}" OUT: k3sup - + rg: desc: download ripgrep vars: @@ -145,11 +145,11 @@ tasks: linux-amd64) echo "x86_64-unknown-linux-musl" ;; linux-arm64) echo "aarch64-unknown-linux-gnu" ;; darwin-amd64) echo "x86_64-apple-darwin" ;; - darwin-arm64) echo "aarch64-apple-darwin" ;; + darwin-arm64) echo "aarch64-apple-darwin" ;; windows-*) echo "x86_64-pc-windows-msvc" ;; *) echo "unknown" ;; esac - URL: "https://github.com/BurntSushi/ripgrep/releases/download/{{.VERSION}}/ripgrep-{{.VERSION}}-{{.SUFFIX}}{{.ARC}}" + URL: "https://github.com/BurntSushi/ripgrep/releases/download/{{.VERSION}}/ripgrep-{{.VERSION}}-{{.SUFFIX}}{{.ARC}}" FILE: "{{base .URL}}" OUT: rg cmds: @@ -280,41 +280,41 @@ tasks: fi EOF executable zip - ;; + ;; windows-*) curl -sL "{{.ZIP_EXE}}" -o zip.exe executable zip.exe ;; esac - #kubefwd: - # desc: download kubefwd - # vars: - # VERSION: "1.25.8" - # SUFFIX: - # sh: | - # case "{{.OS}}-{{.ARCH}}" in - # linux-amd64) echo "_Linux_x86_64" ;; - # linux-arm64) echo "_Linux_arm64" ;; - # darwin-amd64) echo "_Darwin_x86_64" ;; - # darwin-arm64) echo "_Darwin_arm64" ;; - # windows-*) echo "_Windows_x86_64" ;; - # *) echo "unknown" ;; - # esac - # #https://github.com/txn2/kubefwd/releases/download/1.22.5/kubefwd_Darwin_x86_64.tar.gz - # URL: "https://github.com/txn2/kubefwd/releases/download/{{.VERSION}}/kubefwd{{.SUFFIX}}{{.ARC}}" - # FILE: "{{base .URL}}" - # OUT: kubefwd - # cmds: - # - task: download-and-extract - # vars: - # URL: "{{.URL}}" - # FILE: "{{.FILE}}" - # OUT: kubefwd + kubefwd: + desc: download kubefwd + vars: + VERSION: "1.25.5" + SUFFIX: + sh: | + case "{{.OS}}-{{.ARCH}}" in + linux-amd64) echo "_Linux_x86_64" ;; + linux-arm64) echo "_Linux_arm64" ;; + darwin-amd64) echo "_Darwin_x86_64" ;; + darwin-arm64) echo "_Darwin_arm64" ;; + windows-*) echo "_Windows_x86_64" ;; + *) echo "unknown" ;; + esac + #https://github.com/txn2/kubefwd/releases/download/1.22.5/kubefwd_Darwin_x86_64.tar.gz + URL: "https://github.com/txn2/kubefwd/releases/download/v{{.VERSION}}/kubefwd{{.SUFFIX}}{{.ARC}}" + FILE: "{{base .URL}}" + OUT: kubefwd + cmds: + - task: download-and-extract + vars: + URL: "{{.URL}}" + FILE: "{{.FILE}}" + OUT: kubefwd all: - task: 7zz - - task: coreutils + - task: coreutils - task: bun - task: kind - task: k3sup @@ -322,14 +322,14 @@ tasks: - task: rg - task: uv - task: helm - #- task: kubefwd - task: yq # do not test zip as it is a special case #- task: zip # commented out for now + #- task: kubefwd #- task: hugo #- task: k3d - + test: vars: DIR: "{{.OPS_PWD}}/bin/{{.OS}}-{{.ARCH}}" @@ -340,7 +340,7 @@ tasks: cd "{{.DIR}}" {{.DRY}} ops -task -t ../../prereq.yml -d "{{.DIR}}" all - task: check - + check: vars: DIR: "{{.OPS_PWD}}/bin/{{.OS}}-{{.ARCH}}" @@ -359,11 +359,11 @@ tasks: cmds: - for: sources cmd: filetype -m "{{.ITEM}}" | rg {{.FILETYPE}} - + tests: - __OS=linux __ARCH=amd64 ops -task -t prereq.yml test - __OS=linux __ARCH=arm64 ops -task -t prereq.yml test - __OS=darwin __ARCH=amd64 ops -task -t prereq.yml test - __OS=darwin __ARCH=arm64 ops -task -t prereq.yml test - __OS=windows __ARCH=amd64 ops -task -t prereq.yml test - +