gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: fix remote path for archive uploads (#3243)

Browse Source 
archiveUpload did not handle absolute paths correctly. Fix it by using
the basename and ensure that uploads can be tested using -n.
This commit is contained in:
Felix Lange
2016-11-08 23:46:46 +01:00
committed by GitHub
parent 9bc97a5785
commit 8b1df1a259
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/ci.go
View File

@@ -359,11 +359,11 @@ func archiveUpload(archive string, blobstore string, signer string) error {
Token: os.Getenv("AZURE_BLOBSTORE_TOKEN"), Token: os.Getenv("AZURE_BLOBSTORE_TOKEN"),
Container: strings.SplitN(blobstore, "/", 2)[1], Container: strings.SplitN(blobstore, "/", 2)[1],
} }
if err := build.AzureBlobstoreUpload(archive, archive, auth); err != nil { if err := build.AzureBlobstoreUpload(archive, filepath.Base(archive), auth); err != nil {
return err return err
} }
if signer != "" { if signer != "" {
if err := build.AzureBlobstoreUpload(archive+".asc", archive+".asc", auth); err != nil { if err := build.AzureBlobstoreUpload(archive+".asc", filepath.Base(archive+".asc"), auth); err != nil {
return err return err
} }
} }

6
internal/build/azure.go
View File

@@ -16,6 +16,7 @@
package build package build
import ( import (
"fmt"
"os" "os"
"github.com/Azure/azure-sdk-for-go/storage" "github.com/Azure/azure-sdk-for-go/storage"
@@ -36,6 +37,11 @@ type AzureBlobstoreConfig struct {
// //
// See: https://msdn.microsoft.com/en-us/library/azure/dd179451.aspx#Anchor_3 // See: https://msdn.microsoft.com/en-us/library/azure/dd179451.aspx#Anchor_3
func AzureBlobstoreUpload(path string, name string, config AzureBlobstoreConfig) error { func AzureBlobstoreUpload(path string, name string, config AzureBlobstoreConfig) error {
if *DryRunFlag {
fmt.Printf("would upload %q to %s/%s/%s\n", path, config.Account, config.Container, name)
return nil
}
// Create an authenticated client against the Azure cloud // Create an authenticated client against the Azure cloud
rawClient, err := storage.NewBasicClient(config.Account, config.Token) rawClient, err := storage.NewBasicClient(config.Account, config.Token)
if err != nil { if err != nil {