release should work now

solo-io · Nov 13, 2021 · 3b22e52 · 3b22e52
1 parent d23e6f5
commit 3b22e52
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 17 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -28,7 +28,7 @@ jobs:
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
           restore-keys: ${{ runner.os }}-go-
       - name: Upload Assets
-        run: make upload-github-release-assets
+        run: ls && make upload-github-release-assets
         env:
           GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
           TAGGED_VERSION: ${{ github.event.release.tag_name }}
diff --git a/Makefile b/Makefile
@@ -35,16 +35,23 @@ docker-push:
 # CLI
 #----------------------------------------------------------------------------------
 
-.PHONY: ebpfctl-linux-amd64
-ebpfctl-linux-amd64: $(OUTDIR)/ebpfctl-linux-amd64
+
 $(OUTDIR)/ebpfctl-linux-amd64: $(SOURCES)
 	CGO_ENABLED=0 GOARCH=amd64 GOOS=linux go build -ldflags=$(LDFLAGS) -gcflags=$(GCFLAGS) -o $@ ebpfctl/main.go
 
-.PHONY: ebpfctl-linux-arm64
-ebpfctl-linux-arm64: $(OUTDIR)/ebpfctl-linux-arm64
+.PHONY: ebpfctl-linux-amd64
+ebpfctl-linux-amd64: $(OUTDIR)/ebpfctl-linux-amd64.sha256
+$(OUTDIR)/ebpfctl-linux-amd64.sha256: $(OUTDIR)/ebpfctl-linux-amd64
+	sha256sum $(OUTDIR)/ebpfctl-linux-amd64 > $@
+
 $(OUTDIR)/ebpfctl-linux-arm64: $(SOURCES)
 	CGO_ENABLED=0 GOARCH=arm64 GOOS=linux go build -ldflags=$(LDFLAGS) -gcflags=$(GCFLAGS) -o $@ ebpfctl/main.go
 
+.PHONY: ebpfctl-linux-arm64
+ebpfctl-linux-arm64: $(OUTDIR)/ebpfctl-linux-arm64.sha256
+$(OUTDIR)/ebpfctl-linux-arm64.sha256: $(OUTDIR)/ebpfctl-linux-arm64
+	sha256sum $(OUTDIR)/ebpfctl-linux-arm64 > $@
+
 .PHONY: build-cli
 build-cli: ebpfctl-linux-amd64 ebpfctl-linux-arm64
 

diff --git a/ci/release_assets.go b/ci/release_assets.go
@@ -7,20 +7,20 @@ import (
 func main() {
 	const buildDir = "_output"
 	const repoOwner = "solo-io"
-	const repoName = "ebpf"
+	const repoName = "eBPF"
 
-	assets := make([]githubutils.ReleaseAssetSpec, 3)
-	assets[0] = githubutils.ReleaseAssetSpec{
-		Name:       "ebpfctl-linux-amd64",
-		ParentPath: buildDir,
-		UploadSHA:  true,
+	assets := []githubutils.ReleaseAssetSpec{
+		{
+			Name:       "ebpfctl-linux-amd64",
+			ParentPath: buildDir,
+			UploadSHA:  true,
+		},
+		{
+			Name:       "ebpfctl-linux-arm64",
+			ParentPath: buildDir,
+			UploadSHA:  true,
+		},
 	}
-	assets[1] = githubutils.ReleaseAssetSpec{
-		Name:       "ebpfctl-linux-arm64",
-		ParentPath: buildDir,
-		UploadSHA:  true,
-	}
-
 	spec := githubutils.UploadReleaseAssetSpec{
 		Owner:             repoOwner,
 		Repo:              repoName,