FIX: deploy step

Fred78290 · Oct 17, 2022 · 1a5e6ca · 1a5e6ca
1 parent 8e0ddb9
commit 1a5e6ca
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,9 +16,6 @@ jobs:
         uses: actions/checkout@v3
         with:
           submodules: true 
-      - name: Prepare
-        id: prep
-        run: ls -lR
       - name:  Setup Go environment
         uses: actions/setup-go@v3
         with:
@@ -31,7 +28,7 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: binaries
-          path: ecr-credential-provider-*
+          path: out
           if-no-files-found: error
   deploy:
     if: startsWith(github.ref, 'refs/tags/v')
@@ -52,16 +49,16 @@ jobs:
         uses: actions/download-artifact@v3
         with:
           name: binaries
-          path: ecr-credential-provider-*
+          path: out
       - name: Release
         uses: softprops/action-gh-release@v1
         with:
           tag_name: ${{ steps.prep.outputs.tag }}
           release_name: Release ${{ steps.prep.outputs.tag }}
           draft: false
           files: |
-            ecr-credential-provider-amd64
-            ecr-credential-provider-arm64
-            ecr-credential-provider.exe
+            out/ecr-credential-provider-amd64
+            out/ecr-credential-provider-arm64
+            out/ecr-credential-provider.exe
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # You don't need to add this in secrets it's by default.      
diff --git a/Makefile b/Makefile
@@ -28,14 +28,14 @@ ecr-credential-provider:
 	 GO111MODULE=on CGO_ENABLED=0 GOOS=$(GOOS) GOARCH=$(GOARCH) GOPROXY=$(GOPROXY) go build \
 		-trimpath \
 		-ldflags="$(LDFLAGS)" \
-		-o=ecr-credential-provider-$(GOARCH) \
+		-o=out/ecr-credential-provider-$(GOARCH) \
 		cloud-provider-aws/cmd/ecr-credential-provider/*.go
 
 ecr-credential-provider.exe:
 	 GO111MODULE=on CGO_ENABLED=0 GOOS=windows GOPROXY=$(GOPROXY) go build \
 		-trimpath \
 		-ldflags="$(LDFLAGS)" \
-		-o=ecr-credential-provider.exe \
+		-o=out/ecr-credential-provider.exe \
 		cloud-provider-aws/cmd/ecr-credential-provider/*.go
 
 ecr-credential-provider-amd64: