diff --git a/.gitignore b/.gitignore index 4c0410d..a5e8a89 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ bin/*/LICENSE .test_fail_then_succeed cookie.txt actions.zip +nuv.spec diff --git a/bin/linux/nuvfile.yml b/bin/linux/nuvfile.yml index e470113..643a5d4 100644 --- a/bin/linux/nuvfile.yml +++ b/bin/linux/nuvfile.yml @@ -39,14 +39,20 @@ tasks: - rm -r deb-build-{{.ARCH}} - go-bin-deb generate -a {{.ARCH}} --version {{.VERSION}} --wd deb-build-{{.ARCH}} - | - mkdir -p rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS} - cd rpmbuild - sudo alien --to-rpm $NUV_PWD/../nuv_{{.VERSION}}_{{.ARCH}}.deb --scripts --generate - sudo mv nuv-*/*.spec SPECS - sudo mv nuv-*/* BUILD/ - sudo rpmbuild --buildroot $PWD/BUILD -bb SPECS/nuv*.spec + export ARCH="{{.ARCH}}" + case "$ARCH" in + arm64) export TGT="arm64" ;; + amd64) export TGT="x86_64" ;; + esac + export VERSION="{{.VERSION}}" + export VER="${VERSION%%-*}" + cd $NUV_ROOT/linux + sudo alien --to-rpm nuv_${VERSION}_${ARCH}.deb --scripts --generate + cd nuv-${VER} + mv nuv-${VER}-*.spec ../nuv.spec + sudo rpmbuild --target=$TGT --buildroot=$NUV_ROOT/linux/nuv-${VER} -bb ../nuv.spec cd .. - - mv nuv-*.rpm nuv_{{.VERSION}}_{{.ARCH}}.rpm + mv nuv-${VER}-*.$TGT.rpm nuv_${VERSION}_${ARCH}.rpm clean: rm -r *.deb *.rpm deb-build-{{.ARCH}} diff --git a/bin/nuvfile.yml b/bin/nuvfile.yml index d32b517..0c4b1c6 100644 --- a/bin/nuvfile.yml +++ b/bin/nuvfile.yml @@ -244,14 +244,15 @@ tasks: - task: nuv - task: kubectl - task: kind - - task: kops - task: k3sup - - task: mc - task: eksctl - task: grep.exe - task: ntfy - # TODO: for some reasons, helm download does not work in github actions - #- task: helm + # currently not used + #- task: mc # it has "licensing complications" + #- task: kops + # TODO: for some reasons, helm download does not work in github actions + #- task: helm windows-latest: desc: build a msi installer for windows diff --git a/bin/windows/wix.json b/bin/windows/wix.json index 8449c56..5946a4c 100644 --- a/bin/windows/wix.json +++ b/bin/windows/wix.json @@ -10,8 +10,6 @@ "../windows/amd64/kubectl.exe", "../windows/amd64/kind.exe", "../windows/amd64/k3sup.exe", - "../windows/amd64/kops.exe", - "../windows/amd64/mc.exe", "../windows/amd64/eksctl.exe", "../windows/amd64/grep.exe" ]