Skip to content

Commit a33e082

Browse files
authored
expose config decoderConfig to enable reuse (#9695)
1 parent cbdd8d1 commit a33e082

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

.github/workflows/esti.yaml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -122,19 +122,17 @@ jobs:
122122
uses: aws-actions/amazon-ecr-login@v2
123123

124124
- name: Set up Docker Buildx
125-
uses: docker/setup-buildx-action@v2
125+
uses: docker/setup-buildx-action@v3
126126

127127
- name: Build and Push
128-
uses: docker/build-push-action@v5
128+
uses: docker/build-push-action@v6
129129
with:
130130
push: true
131131
tags: ${{ steps.login-ecr.outputs.registry }}/lakefs:${{ needs.gen-code.outputs.tag }}
132132
build-args: VERSION=${{ needs.gen-code.outputs.tag }}
133133
context: .
134-
cache-from: |
135-
type=s3,region=us-east-1,bucket=lakefs-docker-cache,name=lakefs
136-
cache-to: |
137-
type=s3,region=us-east-1,bucket=lakefs-docker-cache,name=lakefs,mode=max
134+
cache-from: type=gha
135+
cache-to: type=gha,mode=max
138136

139137
login-to-amazon-ecr:
140138
runs-on: ubuntu-22.04
@@ -280,9 +278,9 @@ jobs:
280278
uses: aws-actions/amazon-ecr-login@v2
281279

282280
- name: Set up Docker Buildx
283-
uses: docker/setup-buildx-action@v2
281+
uses: docker/setup-buildx-action@v3
284282
- name: Build and Push to Amazon ECR
285-
uses: docker/build-push-action@v5
283+
uses: docker/build-push-action@v6
286284
with:
287285
push: true
288286
tags: ${{ steps.login-ecr.outputs.registry }}/lakefs-rclone-export:${{ steps.version.outputs.tag }}

pkg/config/config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -606,10 +606,10 @@ func SetDefaults(cfgType string, c Config) {
606606
}
607607

608608
func Unmarshal(c Config) error {
609-
return viper.UnmarshalExact(&c, decoderConfig())
609+
return viper.UnmarshalExact(&c, DecoderConfig())
610610
}
611611

612-
func decoderConfig() viper.DecoderConfigOption {
612+
func DecoderConfig() viper.DecoderConfigOption {
613613
hook := viper.DecodeHook(
614614
mapstructure.ComposeDecodeHookFunc(
615615
DecodeStrings,

0 commit comments

Comments
 (0)