Skip to content

Commit

Permalink
maybe final?
Browse files Browse the repository at this point in the history
  • Loading branch information
aztechian committed Jul 4, 2020
1 parent d2bb5cb commit 1fd81b0
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
**/asset/templates.go
/packages
/main
/bridgr
/bridgr-*
*.sha256
code-quality-report.json

Expand Down
23 changes: 7 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ language: go
dist: xenial
os:
- linux
# env:
# global:
# # Force-enable Go modules. This will be unnecessary when Go 1.13 lands.
# - GO111MODULE=on
stages:
- checks
- test
Expand Down Expand Up @@ -63,24 +59,19 @@ jobs:
- ls -altr
arch: amd64
env: GOOS=windows
- stage: build
script:
- GOOS=windows make
- ls -altr
arch: arm64
env: GOOS=windows
- stage: build
script:
- GOOS=darwin make
- ls -altr
arch: amd64
env: GOOS=darwin
- stage: build
script:
- GOOS=darwin make
- ls -altr
arch: arm64
env: GOOS=darwin
# fails to build darwin/arm64 combo
# - stage: build
# script:
# - GOOS=darwin make
# - ls -altr
# arch: arm64
# env: GOOS=darwin

deploy:
on:
Expand Down
7 changes: 4 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,17 @@ CMD := cmd/bridgr/main.go
VERSION := $(shell git describe --always --dirty | sed 's/^v//')
GO_FILES := $(shell find . -name '*.go' | grep -v _test.go)
OS := $(shell go env GOOS)
ARCH := $(shell go env GOARCH)

.SUFFIXES:
.PHONY: all coverage lint test race x2unit xunit clean generate download locallint cilint

ifeq ($(OS), linux)
PROJECT_NAME := $(PROJECT_NAME)-Linux
PROJECT_NAME := $(PROJECT_NAME)-Linux-$(ARCH)
else ifeq ($(OS), windows)
PROJECT_NAME := $(PROJECT_NAME)-Windows
PROJECT_NAME := $(PROJECT_NAME)-Windows-$(ARCH)
else ifeq ($(OS), darwin)
PROJECT_NAME := $(PROJECT_NAME)-MacOS
PROJECT_NAME := $(PROJECT_NAME)-MacOS-$(ARCH)
endif

all: $(PROJECT_NAME) $(PROJECT_NAME).sha256
Expand Down

0 comments on commit 1fd81b0

Please sign in to comment.