diff --git a/.travis.yml b/.travis.yml index d07eb7fc58..a10fe79c9c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,22 +88,22 @@ matrix: script: # Build for the primary platforms that Trusty can manage - go run build/ci.go install - - go run build/ci.go archive -type tar -signer LINUX_SIGNING_KEY -upload ethswarmstorage/builds + - go run build/ci.go archive -type tar -signer LINUX_SIGNING_KEY -upload ethswarm/builds - go run build/ci.go install -arch 386 - - go run build/ci.go archive -arch 386 -type tar -signer LINUX_SIGNING_KEY -upload ethswarmstorage/builds + - go run build/ci.go archive -arch 386 -type tar -signer LINUX_SIGNING_KEY -upload ethswarm/builds # Switch over GCC to cross compilation (breaks 386, hence why do it here only) - sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install gcc-arm-linux-gnueabi libc6-dev-armel-cross gcc-arm-linux-gnueabihf libc6-dev-armhf-cross gcc-aarch64-linux-gnu libc6-dev-arm64-cross - sudo ln -s /usr/include/asm-generic /usr/include/asm - GOARM=5 go run build/ci.go install -arch arm -cc arm-linux-gnueabi-gcc - - GOARM=5 go run build/ci.go archive -arch arm -type tar -signer LINUX_SIGNING_KEY -upload ethswarmstorage/builds + - GOARM=5 go run build/ci.go archive -arch arm -type tar -signer LINUX_SIGNING_KEY -upload ethswarm/builds - GOARM=6 go run build/ci.go install -arch arm -cc arm-linux-gnueabi-gcc - - GOARM=6 go run build/ci.go archive -arch arm -type tar -signer LINUX_SIGNING_KEY -upload ethswarmstorage/builds + - GOARM=6 go run build/ci.go archive -arch arm -type tar -signer LINUX_SIGNING_KEY -upload ethswarm/builds - GOARM=7 go run build/ci.go install -arch arm -cc arm-linux-gnueabihf-gcc - - GOARM=7 go run build/ci.go archive -arch arm -type tar -signer LINUX_SIGNING_KEY -upload ethswarmstorage/builds + - GOARM=7 go run build/ci.go archive -arch arm -type tar -signer LINUX_SIGNING_KEY -upload ethswarm/builds - go run build/ci.go install -arch arm64 -cc aarch64-linux-gnu-gcc - - go run build/ci.go archive -arch arm64 -type tar -signer LINUX_SIGNING_KEY -upload ethswarmstorage/builds + - go run build/ci.go archive -arch arm64 -type tar -signer LINUX_SIGNING_KEY -upload ethswarm/builds # This builder does the Linux Azure MIPS xgo uploads - if: type = push @@ -117,19 +117,19 @@ matrix: script: - go run build/ci.go xgo --alltools -- --targets=linux/mips --ldflags '-extldflags "-static"' -v - for bin in build/bin/*-linux-mips; do mv -f "${bin}" "${bin/-linux-mips/}"; done - - go run build/ci.go archive -arch mips -type tar -signer LINUX_SIGNING_KEY -upload ethswarmstorage/builds + - go run build/ci.go archive -arch mips -type tar -signer LINUX_SIGNING_KEY -upload ethswarm/builds - go run build/ci.go xgo --alltools -- --targets=linux/mipsle --ldflags '-extldflags "-static"' -v - for bin in build/bin/*-linux-mipsle; do mv -f "${bin}" "${bin/-linux-mipsle/}"; done - - go run build/ci.go archive -arch mipsle -type tar -signer LINUX_SIGNING_KEY -upload ethswarmstorage/builds + - go run build/ci.go archive -arch mipsle -type tar -signer LINUX_SIGNING_KEY -upload ethswarm/builds - go run build/ci.go xgo --alltools -- --targets=linux/mips64 --ldflags '-extldflags "-static"' -v - for bin in build/bin/*-linux-mips64; do mv -f "${bin}" "${bin/-linux-mips64/}"; done - - go run build/ci.go archive -arch mips64 -type tar -signer LINUX_SIGNING_KEY -upload ethswarmstorage/builds + - go run build/ci.go archive -arch mips64 -type tar -signer LINUX_SIGNING_KEY -upload ethswarm/builds - go run build/ci.go xgo --alltools -- --targets=linux/mips64le --ldflags '-extldflags "-static"' -v - for bin in build/bin/*-linux-mips64le; do mv -f "${bin}" "${bin/-linux-mips64le/}"; done - - go run build/ci.go archive -arch mips64le -type tar -signer LINUX_SIGNING_KEY -upload ethswarmstorage/builds + - go run build/ci.go archive -arch mips64le -type tar -signer LINUX_SIGNING_KEY -upload ethswarm/builds # This builder does the OSX Azure, iOS CocoaPods and iOS Azure uploads - if: type = push @@ -139,7 +139,7 @@ matrix: - azure-osx script: - go run build/ci.go install - - go run build/ci.go archive -type tar -signer OSX_SIGNING_KEY -upload ethswarmstorage/builds + - go run build/ci.go archive -type tar -signer OSX_SIGNING_KEY -upload ethswarm/builds # This builder does the Azure archive purges to avoid accumulating junk @@ -150,4 +150,4 @@ matrix: env: - azure-purge script: - - go run build/ci.go purge -store ethswarmstorage/builds -days 14 + - go run build/ci.go purge -store ethswarm/builds -days 14 diff --git a/appveyor.yml b/appveyor.yml index 16d732c48e..e6b170991b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -36,8 +36,8 @@ build_script: - go run build\ci.go install after_build: - - go run build\ci.go archive -type zip -signer WINDOWS_SIGNING_KEY -upload ethswarmstorage/builds - - go run build\ci.go nsis -signer WINDOWS_SIGNING_KEY -upload ethswarmstorage/builds + - go run build\ci.go archive -type zip -signer WINDOWS_SIGNING_KEY -upload ethswarm/builds + - go run build\ci.go nsis -signer WINDOWS_SIGNING_KEY -upload ethswarm/builds test_script: - set CGO_ENABLED=1 diff --git a/build/ci.go b/build/ci.go index 5337e47275..5cf4910c26 100644 --- a/build/ci.go +++ b/build/ci.go @@ -317,7 +317,7 @@ func doArchive(cmdline []string) { arch = flag.String("arch", runtime.GOARCH, "Architecture cross packaging") atype = flag.String("type", "zip", "Type of archive to write (zip|tar)") signer = flag.String("signer", "", `Environment variable holding the signing key (e.g. LINUX_SIGNING_KEY)`) - upload = flag.String("upload", "", `Destination to upload the archives (usually "ethswarmstorage/builds")`) + upload = flag.String("upload", "", `Destination to upload the archives (usually "ethswarm/builds")`) ext string ) flag.CommandLine.Parse(cmdline) @@ -691,7 +691,7 @@ func xgoTool(args []string) *exec.Cmd { func doPurge(cmdline []string) { var ( - store = flag.String("store", "", `Destination from where to purge archives (usually "ethswarmstorage/builds")`) + store = flag.String("store", "", `Destination from where to purge archives (usually "ethswarm/builds")`) limit = flag.Int("days", 30, `Age threshold above which to delete unstable archives`) ) flag.CommandLine.Parse(cmdline)