diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8d5177d..75509bd 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -35,28 +35,8 @@ steps: displayName: 'Set up the Go workspace' - script: | - go get github.com/mitchellh/gox - - v="$(git describe --tags)" - - output="{{.Dir}}-{{.OS}}-{{.Arch}}-$v" - osarch="!darwin/arm !darwin/arm64 !darwin/386" - - echo "Compiling:" - - os="windows linux darwin" - arch="amd64 386 arm arm64 mips mips64 mipsle mips64le" - pushd cmd/ck-client || exit 1 - gox -ldflags "-X main.version=${v}" -os="$os" -arch="$arch" -osarch="$osarch" -output="$output" - GOOS="linux" GOARCH="mips" GOMIPS="softfloat" go build -ldflags "-X main.version=${v}" -o ck-client-linux-mips_softfloat-"${v}" - GOOS="linux" GOARCH="mipsle" GOMIPS="softfloat" go build -ldflags "-X main.version=${v}" -o ck-client-linux-mipsle_softfloat-"${v}" - mv ck-client-* $(Build.ArtifactStagingDirectory)/ - - os="linux" - arch="amd64 386 arm arm64" - pushd ../ck-server || exit 1 - gox -ldflags "-X main.version=${v}" -os="$os" -arch="$arch" -osarch="$osarch" -output="$output" - mv ck-server-* $(Build.ArtifactStagingDirectory)/ + v="$(git describe --tags)" ./release.sh + mv ./release/* $(Build.ArtifactStagingDirectory)/ workingDirectory: '$(modulePath)' displayName: 'Get dependencies, then build' @@ -81,4 +61,4 @@ steps: #isPreRelease: false # Optional addChangeLog: false # Optional #compareWith: 'lastFullRelease' # Required when addChangeLog == True. Options: lastFullRelease, lastRelease, lastReleaseByTag - #releaseTag: # Required when compareWith == LastReleaseByTag \ No newline at end of file + #releaseTag: # Required when compareWith == LastReleaseByTag diff --git a/release.sh b/release.sh index ce2426a..8b271cf 100755 --- a/release.sh +++ b/release.sh @@ -2,14 +2,7 @@ go get github.com/mitchellh/gox mkdir -p release -read -rp "Cleaning $PWD/release directory. Proceed? [y/n]" res -if [ ! "$res" == "y" ]; then - echo "Abort" - exit 1 -fi - -rm -rf ./release/* - +rm -f ./release/* if [ -z "$v" ]; then echo "Version number cannot be null. Run with v=[version] release.sh"