Merge branch 'new_master' into ydb

3 years ago · 2d27afb515
3 changed files with 3 additions and 5 deletions
--- a/.github/workflows/binaries_dev.yml
+++ b/.github/workflows/binaries_dev.yml
@ -82,8 +82,7 @@ jobs:
    strategy:
      matrix:
        goos: [darwin]
-        # goarch: [amd64, arm64]
-        goarch: [amd64]
+        goarch: [amd64, arm64]

    steps:

--- a/.github/workflows/binaries_release2.yml
+++ b/.github/workflows/binaries_release2.yml
@ -23,8 +23,7 @@ jobs:
    strategy:
      matrix:
        goos: [darwin]
-        # goarch: [amd64, arm64]
-        goarch: [amd64]
+        goarch: [amd64, arm64]

    # Steps represent a sequence of tasks that will be executed as part of the job
    steps:
--- a/weed/storage/backend/s3_backend/s3_backend.go
+++ b/weed/storage/backend/s3_backend/s3_backend.go
@ -49,7 +49,7 @@ func newS3BackendStorage(configuration backend.StringProperties, configPrefix st
 	s.region = configuration.GetString(configPrefix + "region")
 	s.bucket = configuration.GetString(configPrefix + "bucket")
 	s.endpoint = configuration.GetString(configPrefix + "endpoint")
-	s.storageClass = configuration.GetString(configPrefix + "storageClass")
+	s.storageClass = configuration.GetString(configPrefix + "storage_class")
 	if s.storageClass == "" {
 		s.storageClass = "STANDARD_IA"
 	}