From 77dbca8c58034978990829926870e86ede394195 Mon Sep 17 00:00:00 2001
From: Maik Riechert <maik.riechert@arcor.de>
Date: Sat, 16 Jan 2021 11:27:12 +0000
Subject: [PATCH] fix minor ci issues

---
 .ci/azure-pipelines/release.yml | 3 +++
 .ci/unix/run-in-docker.sh       | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.ci/azure-pipelines/release.yml b/.ci/azure-pipelines/release.yml
index 1df613b2c1..8115c36329 100644
--- a/.ci/azure-pipelines/release.yml
+++ b/.ci/azure-pipelines/release.yml
@@ -9,6 +9,9 @@ steps:
     displayName: Create distribution package
 
 - ${{ if not(eq(parameters.OS_NAME, 'Windows')) }}:
+  - bash: $(run) .ci/unix/use-conda.sh
+    displayName: Enable Conda
+  
   - bash: $(run) .ci/unix/delocate.sh
     displayName: Delocate
 
diff --git a/.ci/unix/run-in-docker.sh b/.ci/unix/run-in-docker.sh
index 1d008b0f1a..85231c1ca4 100755
--- a/.ci/unix/run-in-docker.sh
+++ b/.ci/unix/run-in-docker.sh
@@ -31,7 +31,7 @@ if [ ! "$(docker ps -q -f name=$container)" ]; then
 fi
 
 echo "Running inside container: $@"
-host_envs=$(env | cut -f1 -d= | sed 's/^/-e /' | grep -v -e PATH -e HOME)
+host_envs=$(python3 -c "import os; print(' '.join(f'-e {k}' for k in os.environ if k not in ['PATH', 'HOME']))")
 # Use login shell so that ~/.bash_profile is read.
 # use-conda.sh appends to that file to modify the PATH.
 set -x