diff options
| author | Kali Kaneko <kali@leap.se> | 2018-02-12 20:55:14 +0100 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2018-02-15 16:36:47 +0100 |
| commit | de30dbb6b6ad337da0ad82cef16d7cdff67fd05d (patch) | |
| tree | 11eb471493832e201c35f5ead1f330f7fbd0f730 | |
| parent | 46b973c72c3f00ff856ea5136d39997326523160 (diff) | |
[pkg] ship all the other needed things
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | pkg/docker_build_apt | 3 |
2 files changed, 6 insertions, 2 deletions
@@ -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 diff --git a/pkg/docker_build_apt b/pkg/docker_build_apt index 6b319c56..605bc1be 100644 --- a/pkg/docker_build_apt +++ b/pkg/docker_build_apt @@ -11,6 +11,7 @@ echo "[+] CLONING REPO from $REPO [$BRANCH]" git clone $REPO bitmaskbuild cd bitmaskbuild git checkout $BRANCH +git fetch --tags mkdir -p dist/ -VIRTUAL_ENV=/usr/local make bundle +VIRTUAL_ENV=/usr/local make bundle_linux cp -r dist/* /dist |