From 991eb2ab162de2d0323941f9d0abce93a9ea4285 Mon Sep 17 00:00:00 2001 From: Igor Gov Date: Sun, 24 Oct 2021 12:27:05 +0300 Subject: [PATCH] Revert "TRA-3828 added build for Mac/Apple M1 and Windows (#392)" (#393) This reverts commit f0db3b81a8dfa53296f95e128956659f055203bf. --- cli/Makefile | 5 ++--- cli/README.md.TEMPLATE | 11 +---------- cli/mizu/version/versionCheck.go | 8 +------- 3 files changed, 4 insertions(+), 20 deletions(-) diff --git a/cli/Makefile b/cli/Makefile index 48f42b94e..dd77c510d 100644 --- a/cli/Makefile +++ b/cli/Makefile @@ -27,9 +27,8 @@ build-all: ## Build for all supported platforms. @mkdir -p bin && sed s/_SEM_VER_/$(SEM_VER)/g README.md.TEMPLATE > bin/README.md @$(MAKE) build GOOS=darwin GOARCH=amd64 @$(MAKE) build GOOS=linux GOARCH=amd64 - @$(MAKE) build GOOS=darwin GOARCH=arm64 - @$(MAKE) build GOOS=windows GOARCH=amd64 - @mv ./bin/mizu_windows_amd64 ./bin/mizu.exe + @# $(MAKE) build GOOS=darwin GOARCH=arm64 + @# $(MAKE) GOOS=windows GOARCH=amd64 @# $(MAKE) GOOS=linux GOARCH=386 @# $(MAKE) GOOS=windows GOARCH=386 @# $(MAKE) GOOS=linux GOARCH=arm64 diff --git a/cli/README.md.TEMPLATE b/cli/README.md.TEMPLATE index ed922a8c8..83288847f 100644 --- a/cli/README.md.TEMPLATE +++ b/cli/README.md.TEMPLATE @@ -2,25 +2,16 @@ Download Mizu for your platform -**Mac** (Intel) +**Mac** (on Intel chip) ``` curl -Lo mizu https://github.com/up9inc/mizu/releases/download/_SEM_VER_/mizu_darwin_amd64 && chmod 755 mizu ``` -**Mac** (Apple M1 silicon) -``` -curl -Lo mizu https://github.com/up9inc/mizu/releases/download/_SEM_VER_/mizu_darwin_arm64 && chmod 755 mizu -``` - **Linux** ``` curl -Lo mizu https://github.com/up9inc/mizu/releases/download/_SEM_VER_/mizu_linux_amd64 && chmod 755 mizu ``` -**Windows** (Intel 64bit) -``` -curl -LO https://github.com/up9inc/mizu/releases/download/_SEM_VER_/mizu.exe -``` ### Checksums SHA256 checksums available for compiled binaries. diff --git a/cli/mizu/version/versionCheck.go b/cli/mizu/version/versionCheck.go index 32f5e01f2..db3d85fb6 100644 --- a/cli/mizu/version/versionCheck.go +++ b/cli/mizu/version/versionCheck.go @@ -85,13 +85,7 @@ func CheckNewerVersion(versionChan chan string) { logger.Log.Debugf("Finished version validation, github version %v, current version %v, took %v", gitHubVersion, currentSemVer, time.Since(start)) if gitHubVersionSemVer.GreaterThan(currentSemVer) { - var downloadMessage string - if runtime.GOOS == "windows" { - downloadMessage = fmt.Sprintf("curl -LO %v/mizu.exe", strings.Replace(*latestRelease.HTMLURL, "tag", "download", 1)) - } else { - downloadMessage = fmt.Sprintf("curl -Lo mizu %v/mizu_%s_%s && chmod 755 mizu", strings.Replace(*latestRelease.HTMLURL, "tag", "download", 1), runtime.GOOS, runtime.GOARCH) - } - versionChan <- fmt.Sprintf("Update available! %v -> %v (%s)", mizu.SemVer, gitHubVersion, downloadMessage) + versionChan <- fmt.Sprintf("Update available! %v -> %v (curl -Lo mizu %v/mizu_%s_amd64 && chmod 755 mizu)", mizu.SemVer, gitHubVersion, strings.Replace(*latestRelease.HTMLURL, "tag", "download", 1), runtime.GOOS) } else { versionChan <- "" }