mirror of
https://github.com/Jguer/yay
synced 2024-10-05 23:59:13 +00:00
Fix order of variables
This commit is contained in:
parent
e698336873
commit
963af374b5
1
.github/workflows/docker-ci.yml
vendored
1
.github/workflows/docker-ci.yml
vendored
|
@ -4,7 +4,6 @@ on: [push, pull_request]
|
|||
|
||||
jobs:
|
||||
build:
|
||||
# Job name is Greeting
|
||||
name: Build and test yay
|
||||
# This job runs on Linux
|
||||
runs-on: ubuntu-latest
|
||||
|
|
19
Makefile
19
Makefile
|
@ -1,25 +1,24 @@
|
|||
export GO111MODULE=on
|
||||
|
||||
PKGNAME := yay
|
||||
ARCH ?= $(shell uname -m)
|
||||
BIN := yay
|
||||
PREFIX := /usr/local
|
||||
DESTDIR :=
|
||||
GO ?= go
|
||||
GOFLAGS := -v
|
||||
EXTRA_GOFLAGS ?=
|
||||
LDFLAGS := $(LDFLAGS) -X "main.version=${VERSION}"
|
||||
PKGNAME := yay
|
||||
PREFIX := /usr/local
|
||||
|
||||
MAJORVERSION := 9
|
||||
MINORVERSION := 3
|
||||
PATCHVERSION := 2
|
||||
|
||||
ARCH ?= $(shell uname -m)
|
||||
|
||||
VERSION ?= ${MAJORVERSION}.${MINORVERSION}.${PATCHVERSION}
|
||||
|
||||
GOFLAGS := -v
|
||||
EXTRA_GOFLAGS ?=
|
||||
LDFLAGS := $(LDFLAGS) -X "main.version=${VERSION}"
|
||||
|
||||
RELEASE_DIR := ${PKGNAME}_${VERSION}_${ARCH}
|
||||
PACKAGE := $(RELEASE_DIR).tar.gz
|
||||
SOURCES ?= $(shell find . -name "*.go" -type f)
|
||||
SOURCES ?= $(shell find . -path ./vendor -prune -o -name "*.go" -type f)
|
||||
|
||||
.PHONY: all
|
||||
all: | clean release
|
||||
|
@ -35,7 +34,7 @@ clean:
|
|||
.PHONY: test
|
||||
test: test-vendor
|
||||
$(GO) vet .
|
||||
@test -z "$$(gofmt -l $(SRC))" || (echo "Files need to be linted. Use make fmt" && false)
|
||||
@test -z "$$(gofmt -l *.go)" || (echo "Files need to be linted. Use make fmt" && false)
|
||||
$(GO) test -mod=vendor --race -covermode=atomic -v . ./pkg/...
|
||||
|
||||
.PHONY: build
|
||||
|
|
Loading…
Reference in a new issue