CD fixes (#189)

* Added logging of file copies to CD jobs * make bash print commands in CD
awslabs · Oct 12, 2020 · e67a5e2 · e67a5e2
1 parent 917262c
commit e67a5e2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/codebuild/cd/publish_to_prod_pypi.yml b/codebuild/cd/publish_to_prod_pypi.yml
@@ -14,9 +14,9 @@ phases:
     commands:
       - echo Build started on `date`
       - mkdir dist
-      - cp -r $CODEBUILD_SRC_DIR_aws_crt_python_windows/dist/* dist/
-      - cp -r $CODEBUILD_SRC_DIR_aws_crt_python_manylinux1/dist/* dist/
-      - cp -r $CODEBUILD_SRC_DIR_aws_crt_python_osx/* dist/
+      - cp -rv $CODEBUILD_SRC_DIR_aws_crt_python_windows/dist/* dist/
+      - cp -rv $CODEBUILD_SRC_DIR_aws_crt_python_manylinux1/dist/* dist/
+      - cp -rv $CODEBUILD_SRC_DIR_aws_crt_python_osx/* dist/
       - ls -la dist/
       - cd aws-crt-python
       - CURRENT_TAG_VERSION=$(git describe --tags | cut -f2 -dv)
@@ -26,4 +26,3 @@ phases:
   post_build:
     commands:
       - echo Build completed on `date`
-
diff --git a/codebuild/cd/publish_to_test_pypi.yml b/codebuild/cd/publish_to_test_pypi.yml
@@ -14,9 +14,9 @@ phases:
     commands:
       - echo Build started on `date`
       - mkdir dist
-      - cp -r $CODEBUILD_SRC_DIR_aws_crt_python_windows/dist/* dist/
-      - cp -r $CODEBUILD_SRC_DIR_aws_crt_python_manylinux1/dist/* dist/
-      - cp -r $CODEBUILD_SRC_DIR_aws_crt_python_osx/* dist/
+      - cp -rv $CODEBUILD_SRC_DIR_aws_crt_python_windows/dist/* dist/
+      - cp -rv $CODEBUILD_SRC_DIR_aws_crt_python_manylinux1/dist/* dist/
+      - cp -rv $CODEBUILD_SRC_DIR_aws_crt_python_osx/* dist/
       - ls -la dist/
       - cd aws-crt-python
       - CURRENT_TAG_VERSION=$(git describe --tags | cut -f2 -dv)
@@ -26,4 +26,3 @@ phases:
   post_build:
     commands:
       - echo Build completed on `date`
-
diff --git a/continuous-delivery/build-wheels-manylinux2014-arm.sh b/continuous-delivery/build-wheels-manylinux2014-arm.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 #before running this, you'll need cmake3 and a compiler. These python versions are just
 #using the default python installers from python.org. Each version needs updated pip, wheel, and setuptools
-set -e
+set -ex
 
 /usr/local/bin/python3.8 ./continuous-delivery/update-version.py
 
@@ -20,6 +20,6 @@ auditwheel repair --plat manylinux2014_aarch64 dist/awscrt-*cp37*.whl
 auditwheel repair --plat manylinux2014_aarch64 dist/awscrt-*cp38*.whl
 
 rm dist/*.whl
-cp -r wheelhouse/* dist/
+cp -rv wheelhouse/* dist/
 
 #now you just need to run twine (that's in a different script)
diff --git a/continuous-delivery/build-wheels-manylinux2014-x86_64.sh b/continuous-delivery/build-wheels-manylinux2014-x86_64.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 #before running this, you'll need cmake3 and a compiler. These python versions are just
 #using the default python installers from python.org. Each version needs updated pip, wheel, and setuptools
-set -e
+set -ex
 
 /usr/local/bin/python3.8 ./continuous-delivery/update-version.py
 
@@ -20,6 +20,6 @@ auditwheel repair --plat manylinux2014_x86_64 dist/awscrt-*cp37*.whl
 auditwheel repair --plat manylinux2014_x86_64 dist/awscrt-*cp38*.whl
 
 rm dist/*.whl
-cp -r wheelhouse/* dist/
+cp -rv wheelhouse/* dist/
 
 #now you just need to run twine (that's in a different script)