adjust regex and use --rm for docker container

kaaengine · Aug 8, 2020 · f667faa · f667faa
1 parent d557e86
commit f667faa
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/kaacore b/kaacore
diff --git a/scripts/wheel_builder.sh b/scripts/wheel_builder.sh
@@ -25,7 +25,7 @@ python -c 'import versioneer; versioneer.write_to_version_file("_build_version.p
 
 for PY_VERSION in ${TARGETS}
 do
-    sudo docker run -i -t -v `pwd`:/host "${DOCKER_IMAGE}" \
+    sudo docker run --rm -it -v `pwd`:/host "${DOCKER_IMAGE}" \
         /bin/bash /host/scripts/docker_wheel_builder.sh ${PY_VERSION}
 done
 

diff --git a/setup.py b/setup.py
@@ -15,7 +15,7 @@
 
 
 def _filter_cmake_manifest(cmake_manifest):
-    pattern = r'^_skbuild/.+(/src/kaa/.+)|(/bin/shaderc)$'
+    pattern = r'^_skbuild/.+(?:(/src/kaa/.+)|(/bin/shaderc))$'
     return [
         path for path in cmake_manifest
         if re.match(pattern, path)