try unify environment-var settings

deltachat · Apr 2, 2019 · 4a1a063 · 4a1a063
1 parent ef350e2
commit 4a1a063
Showing 1 changed file with 12 additions and 15 deletions.
diff --git a/ci_scripts/config.yml b/ci_scripts/config.yml
@@ -32,9 +32,6 @@ jobs:
   upload_docs_wheels:
     machine: True
     steps:
-      - run:
-          command: |
-            echo 'export MESONARGS=""' >> $BASH_ENV 
       - checkout
       - attach_workspace:
           at: workspace
@@ -46,31 +43,31 @@ jobs:
     steps:
       - checkout
       - run: docker pull deltachat/coredeps
-      - run:
-          command: |
-            echo 'export MESONARGS="-Dmonolith=true"' >> $BASH_ENV
-            echo 'export TESTS=1' >> $BASH_ENV 
-      - run: ci_scripts/ci_run.sh
+      - run: 
+          environment:
+            MESONARGS: -Dmonolith=true
+            TESTS: 1
+          command: ci_scripts/ci_run.sh
 
   build_static:
     machine: True
     steps:
       - checkout
       - run: docker pull deltachat/coredeps
-      - run:
-          command: |
-            echo 'export MESONARGS="--default-library=static"' >> $BASH_ENV
-      - run: ci_scripts/ci_run.sh
+      - run: 
+          environment:
+            MESONARGS: --default-library=static 
+          command: ci_scripts/ci_run.sh
 
   build_forcefallback: 
     machine: True
     steps:
       - checkout
       - run: docker pull deltachat/coredeps
       - run:
-          command: |
-            echo 'export MESONARGS="--wrap-mode=forcefallback --default-library=static"' >> $BASH_ENV
-      - run: ci_scripts/ci_run.sh
+          environment:
+            MESONARGS: --wrap-mode=forcefallback --default-library=static
+          command: ci_scripts/ci_run.sh
 
 workflows:
   version: 2