From 396917474394555c2f4228ca644fa8eb8c558b81 Mon Sep 17 00:00:00 2001 From: Martin Redolatti Date: Thu, 25 Jan 2024 11:44:48 -0300 Subject: [PATCH] fix asset copyting in linux build env --- Makefile | 5 +---- splitio/commitversion.go | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index d453d836..2d7bacb2 100644 --- a/Makefile +++ b/Makefile @@ -194,14 +194,11 @@ $(addprefix $(BUILD_FIPS)/,$(windows_execs)): $(BUILD_FIPS)/split_%: $(sources) mkdir -p $(BUILD_FIPS) bash -c 'pushd windows && ./build_from_mac.sh' cp $(BUILD_FIPS_WIN_TMP)/$(shell basename $@) $(BUILD_FIPS) - #cp $(BUILD_FIPS_WIN_TMP)/split_sync_windows.exe $(BUILD_FIPS) - #cp $(BUILD_FIPS_WIN_TMP)/split_proxy_windows.exe $(BUILD_FIPS) else $(addprefix $(BUILD_FIPS)/,$(windows_execs)): $(BUILD_FIPS)/split_%: $(sources) go.sum mkdir -p $(BUILD_FIPS) # we're on linux, we can build natively $(MAKE) -f Makefile -C ./windows setup_ms_go binaries - cp $(BUILD_FIPS_WIN_TMP)/split-sync-fips.exe $(BUILD_FIPS)/split_sync_windows.exe - cp $(BUILD_FIPS_WIN_TMP)/split-proxy-fips.exe $(BUILD_FIPS)/split_proxy_windows.exe + cp $(BUILD_FIPS_WIN_TMP)/$(shell basename $@) $(BUILD_FIPS) endif # @} diff --git a/splitio/commitversion.go b/splitio/commitversion.go index 201dbed9..7ac759dc 100644 --- a/splitio/commitversion.go +++ b/splitio/commitversion.go @@ -5,4 +5,4 @@ This file is created automatically, please do not edit */ // CommitVersion is the version of the last commit previous to release -const CommitVersion = "ec42bee" +const CommitVersion = "27e4829"