From f2f317baf885556c93ae52b2b717a5dc83548b33 Mon Sep 17 00:00:00 2001 From: Cornelius Weig <22861411+corneliusweig@users.noreply.github.com> Date: Mon, 8 Jun 2020 00:06:34 +0200 Subject: [PATCH] move action --- .github/workflows/ci.yml | 12 ++++++------ Makefile | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b3c7c47..b5fc2f8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,6 +15,12 @@ jobs: runs-on: ubuntu-latest steps: + - name: Install UPX + # if: contains(github.ref, 'tags') + run: | + sudo apt update + sudo apt install -y upx + - name: Set up Go 1.13 uses: actions/setup-go@v2 with: @@ -48,12 +54,6 @@ jobs: - name: Verify build run: make dev - - name: Install UPX - # if: contains(github.ref, 'tags') - run: | - apt update - apt install -y upx - - name: Make binaries if: contains(github.ref, 'tags') run: | diff --git a/Makefile b/Makefile index 2b313db..93186d5 100644 --- a/Makefile +++ b/Makefile @@ -94,7 +94,7 @@ build-ketall: $(GO_FILES) $(BUILDDIR) GOFLAGS="-trimpath" gox -osarch="$(PLATFORMS)" -tags netgo -ldflags $(GO_LDFLAGS) -output="$(BUILDDIR)/ketall-{{.Arch}}-{{.OS}}" build-get-all: $(GO_FILES) $(BUILDDIR) - GOFLAGS="-trimpath" gox -osarch="$(PLATFORMS)" -tags getall,netgo -ldflags $(GO_LDFLAGS) -output="out/get-all-{{.Arch}}-{{.OS}}" + GOFLAGS="-trimpath" gox -osarch="$(PLATFORMS)" -tags getall,netgo -ldflags $(GO_LDFLAGS) -output="$(BUILDDIR)/get-all-{{.Arch}}-{{.OS}}" .PHONY: lint lint: