mirror of
https://github.com/SmartHoneybee/ubiquitous-memory
synced 2025-10-25 15:53:48 +02:00
travis (#2)
This commit is contained in:
63
make.patch
Normal file
63
make.patch
Normal file
@@ -0,0 +1,63 @@
|
||||
diff --git a/build/release.mk b/build/release.mk
|
||||
index 5eaee80..e0e13bf 100644
|
||||
--- a/build/release.mk
|
||||
+++ b/build/release.mk
|
||||
@@ -3,7 +3,7 @@ dist: | check-style test package
|
||||
|
||||
build-linux:
|
||||
@echo Build Linux amd64
|
||||
- env GOOS=linux GOARCH=amd64 $(GO) install $(GOFLAGS) $(GO_LINKER_FLAGS) ./cmd/platform
|
||||
+ env GOOS=linux GOARCH=arm $(GO) install $(GOFLAGS) $(GO_LINKER_FLAGS) ./cmd/platform
|
||||
|
||||
build-osx:
|
||||
@echo Build OSX amd64
|
||||
@@ -32,6 +32,7 @@ package:
|
||||
|
||||
@# Resource directories
|
||||
cp -RL config $(DIST_PATH)
|
||||
+ mv $(DIST_PATH)/config/default.json $(DIST_PATH)/config/config.json
|
||||
cp -RL fonts $(DIST_PATH)
|
||||
cp -RL templates $(DIST_PATH)
|
||||
cp -RL i18n $(DIST_PATH)
|
||||
@@ -61,38 +62,14 @@ endif
|
||||
|
||||
@# ----- PLATFORM SPECIFIC -----
|
||||
|
||||
- @# Make osx package
|
||||
- @# Copy binary
|
||||
-ifeq ($(BUILDER_GOOS_GOARCH),"darwin_amd64")
|
||||
- cp $(GOPATH)/bin/platform $(DIST_PATH)/bin # from native bin dir, not cross-compiled
|
||||
-else
|
||||
- cp $(GOPATH)/bin/darwin_amd64/platform $(DIST_PATH)/bin # from cross-compiled bin dir
|
||||
-endif
|
||||
- @# Package
|
||||
- tar -C dist -czf $(DIST_PATH)-$(BUILD_TYPE_NAME)-osx-amd64.tar.gz mattermost
|
||||
- @# Cleanup
|
||||
- rm -f $(DIST_PATH)/bin/platform
|
||||
-
|
||||
- @# Make windows package
|
||||
- @# Copy binary
|
||||
-ifeq ($(BUILDER_GOOS_GOARCH),"windows_amd64")
|
||||
- cp $(GOPATH)/bin/platform.exe $(DIST_PATH)/bin # from native bin dir, not cross-compiled
|
||||
-else
|
||||
- cp $(GOPATH)/bin/windows_amd64/platform.exe $(DIST_PATH)/bin # from cross-compiled bin dir
|
||||
-endif
|
||||
- @# Package
|
||||
- cd $(DIST_ROOT) && zip -9 -r -q -l mattermost-$(BUILD_TYPE_NAME)-windows-amd64.zip mattermost && cd ..
|
||||
- @# Cleanup
|
||||
- rm -f $(DIST_PATH)/bin/platform.exe
|
||||
-
|
||||
@# Make linux package
|
||||
@# Copy binary
|
||||
-ifeq ($(BUILDER_GOOS_GOARCH),"linux_amd64")
|
||||
+ifeq ($(BUILDER_GOOS_GOARCH),"linux_arm")
|
||||
cp $(GOPATH)/bin/platform $(DIST_PATH)/bin # from native bin dir, not cross-compiled
|
||||
else
|
||||
- cp $(GOPATH)/bin/linux_amd64/platform $(DIST_PATH)/bin # from cross-compiled bin dir
|
||||
+ cp $(GOPATH)/bin/linux_arm/platform $(DIST_PATH)/bin # from cross-compiled bin dir
|
||||
endif
|
||||
@# Package
|
||||
- tar -C dist -czf $(DIST_PATH)-$(BUILD_TYPE_NAME)-linux-amd64.tar.gz mattermost
|
||||
+ tar -C dist -czf $(DIST_PATH)-$(BUILD_TYPE_NAME)-linux-arm.tar.gz mattermost
|
||||
@# Don't clean up native package so dev machines will have an unzipped package available
|
||||
@#rm -f $(DIST_PATH)/bin/platform
|
||||
Reference in New Issue
Block a user