Skip to content

Commit

Permalink
generating better rpm and remoing mc and kops
Browse files Browse the repository at this point in the history
  • Loading branch information
msciabarra committed Oct 15, 2023
1 parent 75f6cef commit 247dccf
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 13 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,4 @@ bin/*/LICENSE
.test_fail_then_succeed
cookie.txt
actions.zip
nuv.spec
20 changes: 13 additions & 7 deletions bin/linux/nuvfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}}

Expand Down
9 changes: 5 additions & 4 deletions bin/nuvfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions bin/windows/wix.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
Expand Down

0 comments on commit 247dccf

Please sign in to comment.