From 298e6249e6419a493300b9ecb89e666a2c67a65d Mon Sep 17 00:00:00 2001 From: Andy Wang Date: Sun, 20 Dec 2020 00:21:16 +0000 Subject: [PATCH] Fixup build scripts --- .github/workflows/release.yml | 5 ++--- release.sh | 6 +++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 39d8cf1..1b59569 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,11 +13,10 @@ jobs: - name: Build run: | export PATH=${PATH}:`go env GOPATH`/bin - v=${{ github.ref }} ./release.sh + v=${GITHUB_REF#refs/*/} ./release.sh - name: Release uses: softprops/action-gh-release@v1 with: - fail_on_unmatched_files: true - files: release/*.* + files: release/* env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/release.sh b/release.sh index 8b271cf..bee82f8 100755 --- a/release.sh +++ b/release.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env bash + go get github.com/mitchellh/gox mkdir -p release @@ -21,9 +23,11 @@ CGO_ENABLED=0 gox -ldflags "-X main.version=${v}" -os="$os" -arch="$arch" -osarc CGO_ENABLED=0 GOOS="linux" GOARCH="mips" GOMIPS="softfloat" go build -ldflags "-X main.version=${v}" -o ck-client-linux-mips_softfloat-"${v}" CGO_ENABLED=0 GOOS="linux" GOARCH="mipsle" GOMIPS="softfloat" go build -ldflags "-X main.version=${v}" -o ck-client-linux-mipsle_softfloat-"${v}" mv ck-client-* ../../release +popd os="linux" arch="amd64 386 arm arm64" -pushd ../ck-server || exit 1 +pushd cmd/ck-server || exit 1 CGO_ENABLED=0 gox -ldflags "-X main.version=${v}" -os="$os" -arch="$arch" -osarch="$osarch" -output="$output" mv ck-server-* ../../release +popd \ No newline at end of file