From de30dbb6b6ad337da0ad82cef16d7cdff67fd05d Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Mon, 12 Feb 2018 20:55:14 +0100 Subject: [pkg] ship all the other needed things --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 460e0a7a..ecf66560 100644 --- a/Makefile +++ b/Makefile @@ -94,6 +94,7 @@ bundler_image: cd pkg/docker_bundleapt && make bundler bundle_in_docker: + # this runs bundles inside a virtualenv. it is kind of slow because it compiles all python extensions in dependencies each time. rm -rf $(DIST_VERSION) bitmaskbuild cat pkg/docker_build | docker run -i -v ~/leap/bitmask-dev:/dist -w /dist -u `id -u` -e REPO="$(REPO)" -e BRANCH="$(BRANCH)" local_bundler bash mkdir -p dist/ @@ -103,7 +104,9 @@ bundle_in_docker: bundle_in_docker_apt: # needs a docker container called 'bitmask-bundler-apt', created with 'make bundler_image' rm -rf $(DIST_VERSION) bitmaskbuild - cat pkg/docker_build_apt | docker run -i -v /srv/bitmask-builds:/dist -w /dist -u `id -u` -e REPO="$(REPO)" -e BRANCH="$(BRANCH)" bitmask-bundler-apt bash + # XXX why was it needed to specify -u `id -u` again? if it's something with gilab CI we might need + # to chown it first. + cat pkg/docker_build_apt | docker run -i -v /srv/bitmask-builds:/dist -w /dist -e REPO="$(REPO)" -e BRANCH="$(BRANCH)" bitmask-bundler-apt bash upload: python setup.py sdist bdist_wheel --universal upload --sign -i kali@leap.se -r pypi -- cgit v1.2.3