From 143a1b31ec02496b738faba35600ac3d5ecc1cf5 Mon Sep 17 00:00:00 2001 From: Mohammed Ahmed Date: Fri, 29 Oct 2021 18:27:29 +0530 Subject: [PATCH] Adding darwin-arm64 build for artifacts (#5197) * Adding darwin-arm64 build for artifacts Signed-off-by: Mohammed Zeeshan Ahmed * Updating spec missed in last commit Signed-off-by: Mohammed Zeeshan Ahmed --- rpms/openshift-odo.spec | 3 +++ scripts/cross-compile.sh | 2 +- scripts/rpm-x86_64-test.sh | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/rpms/openshift-odo.spec b/rpms/openshift-odo.spec index d31af7527..5885e3e3d 100644 --- a/rpms/openshift-odo.spec +++ b/rpms/openshift-odo.spec @@ -60,6 +60,7 @@ install -p -m 755 dist/release/odo-linux-arm64 %{buildroot}%{_datadir}/%{name}-r install -p -m 755 dist/release/odo-linux-ppc64le %{buildroot}%{_datadir}/%{name}-redistributable/odo-linux-ppc64le install -p -m 755 dist/release/odo-linux-s390x %{buildroot}%{_datadir}/%{name}-redistributable/odo-linux-s390x install -p -m 755 dist/release/odo-darwin-amd64 %{buildroot}%{_datadir}/%{name}-redistributable/odo-darwin-amd64 +install -p -m 755 dist/release/odo-darwin-arm64 %{buildroot}%{_datadir}/%{name}-redistributable/odo-darwin-arm64 install -p -m 755 dist/release/odo-windows-amd64.exe %{buildroot}%{_datadir}/%{name}-redistributable/odo-windows-amd64.exe cp -avrf dist/release/odo*.tar.gz %{buildroot}%{_datadir}/%{name}-redistributable cp -avrf dist/release/odo*.zip %{buildroot}%{_datadir}/%{name}-redistributable @@ -93,6 +94,8 @@ Obsoletes: %{package_name}-redistributable <= %{odo_version} %{_datadir}/%{name}-redistributable/odo-linux-s390x.tar.gz %{_datadir}/%{name}-redistributable/odo-darwin-amd64 %{_datadir}/%{name}-redistributable/odo-darwin-amd64.tar.gz +%{_datadir}/%{name}-redistributable/odo-darwin-arm64 +%{_datadir}/%{name}-redistributable/odo-darwin-arm64.tar.gz %{_datadir}/%{name}-redistributable/odo-windows-amd64.exe %{_datadir}/%{name}-redistributable/odo-windows-amd64.exe.zip %{_datadir}/%{name}-redistributable/SHA256_SUM diff --git a/scripts/cross-compile.sh b/scripts/cross-compile.sh index 5b0d79a08..81c416461 100755 --- a/scripts/cross-compile.sh +++ b/scripts/cross-compile.sh @@ -8,7 +8,7 @@ if [[ -z "${*}" ]]; then exit 1 fi -for platform in linux-amd64 linux-arm64 linux-ppc64le linux-s390x darwin-amd64 windows-amd64 ; do +for platform in linux-amd64 linux-arm64 linux-ppc64le linux-s390x darwin-amd64 darwin-arm64 windows-amd64 ; do echo "Cross compiling $platform and placing binary at dist/bin/$platform/" if [ $platform == "windows-amd64" ]; then GOARCH=amd64 GOOS=windows go build -o dist/bin/$platform/odo.exe "${@}" ./cmd/odo/ diff --git a/scripts/rpm-x86_64-test.sh b/scripts/rpm-x86_64-test.sh index b1d0ce40b..79eeefa6b 100755 --- a/scripts/rpm-x86_64-test.sh +++ b/scripts/rpm-x86_64-test.sh @@ -19,7 +19,7 @@ ls ./usr/bin | grep odo ./usr/bin/odo version popd -RL="odo-darwin-amd64 odo-linux-ppc64le odo-linux-arm64 odo-windows-amd64.exe odo-linux-amd64 odo-linux-s390x" +RL="odo-darwin-amd64 odo-darwin-arm64 odo-linux-ppc64le odo-linux-arm64 odo-windows-amd64.exe odo-linux-amd64 odo-linux-s390x" echo "Validating odo-redistributable rpm" rpm2cpio dist/rpmbuild/RPMS/x86_64/`ls dist/rpmbuild/RPMS/x86_64/ | grep redistributable` > dist/rpmtest/redistributable/odo-redistribuable.cpio pushd dist/rpmtest/redistributable