Created
February 16, 2017 07:03
-
-
Save ascandella/ad0200fe32d3b8e9c89e8069932b2186 to your computer and use it in GitHub Desktop.
Leaving race package files around for Uber Golang Debian Packages
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/debian/rules b/debian/rules | |
index ae9ac7447..663c31cc1 100755 | |
--- a/debian/rules | |
+++ b/debian/rules | |
@@ -60,13 +60,10 @@ ifeq (true, $(RUN_TESTS)) | |
# -k keep going even when error occurred | |
# -no-rebuild don't rebuild std and cmd packages | |
- # On linux/amd64 run.bash installs some race enabled standard library | |
- # packages. Delete them again to avoid accidentally including them in | |
- # the package. | |
set -ex; \ | |
export PATH="$(GOROOT)/bin:$$PATH"; \ | |
eval "$$(go tool dist env)"; \ | |
- rm -rf "$(GOROOT)/pkg/$${GOOS}_$${GOARCH}_race/" | |
+ echo Leaving "$(GOROOT)/pkg/$${GOOS}_$${GOARCH}_race/" for Uber Jenkins | |
else | |
# skip the tests on platforms where they fail | |
endif | |
@@ -98,7 +95,9 @@ override_dh_auto_build-arch: | |
export GOROOT_BOOTSTRAP=$$(env -i go env GOROOT) \ | |
&& cd src \ | |
&& $(CURDIR)/debian/helpers/goenv.sh \ | |
- bash ./make.bash --no-banner | |
+ bash ./make.bash --no-banner \ | |
+ && $(CURDIR)/debian/helpers/goenv.sh \ | |
+ bash ./race.bash | |
opt_no_act := | |
ifneq (,$(findstring n,$(MAKEFLAGS))) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment