Skip to content

Commit 1fd81b0

Browse files
committed
maybe final?
1 parent d2bb5cb commit 1fd81b0

File tree

3 files changed

+12
-20
lines changed

3 files changed

+12
-20
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
**/asset/templates.go
1717
/packages
1818
/main
19-
/bridgr
19+
/bridgr-*
2020
*.sha256
2121
code-quality-report.json
2222

.travis.yml

+7-16
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@ language: go
22
dist: xenial
33
os:
44
- linux
5-
# env:
6-
# global:
7-
# # Force-enable Go modules. This will be unnecessary when Go 1.13 lands.
8-
# - GO111MODULE=on
95
stages:
106
- checks
117
- test
@@ -63,24 +59,19 @@ jobs:
6359
- ls -altr
6460
arch: amd64
6561
env: GOOS=windows
66-
- stage: build
67-
script:
68-
- GOOS=windows make
69-
- ls -altr
70-
arch: arm64
71-
env: GOOS=windows
7262
- stage: build
7363
script:
7464
- GOOS=darwin make
7565
- ls -altr
7666
arch: amd64
7767
env: GOOS=darwin
78-
- stage: build
79-
script:
80-
- GOOS=darwin make
81-
- ls -altr
82-
arch: arm64
83-
env: GOOS=darwin
68+
# fails to build darwin/arm64 combo
69+
# - stage: build
70+
# script:
71+
# - GOOS=darwin make
72+
# - ls -altr
73+
# arch: arm64
74+
# env: GOOS=darwin
8475

8576
deploy:
8677
on:

Makefile

+4-3
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@ CMD := cmd/bridgr/main.go
44
VERSION := $(shell git describe --always --dirty | sed 's/^v//')
55
GO_FILES := $(shell find . -name '*.go' | grep -v _test.go)
66
OS := $(shell go env GOOS)
7+
ARCH := $(shell go env GOARCH)
78

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

1112
ifeq ($(OS), linux)
12-
PROJECT_NAME := $(PROJECT_NAME)-Linux
13+
PROJECT_NAME := $(PROJECT_NAME)-Linux-$(ARCH)
1314
else ifeq ($(OS), windows)
14-
PROJECT_NAME := $(PROJECT_NAME)-Windows
15+
PROJECT_NAME := $(PROJECT_NAME)-Windows-$(ARCH)
1516
else ifeq ($(OS), darwin)
16-
PROJECT_NAME := $(PROJECT_NAME)-MacOS
17+
PROJECT_NAME := $(PROJECT_NAME)-MacOS-$(ARCH)
1718
endif
1819

1920
all: $(PROJECT_NAME) $(PROJECT_NAME).sha256

0 commit comments

Comments
 (0)