Browse Source

try unify environment-var settings

holger krekel 5 months ago
parent
commit
4a1a0638da
Signed by: holger krekel (No account linked to committer's email)
1 changed files with 12 additions and 15 deletions
  1. 12
    15
      ci_scripts/config.yml

+ 12
- 15
ci_scripts/config.yml View File

@@ -32,9 +32,6 @@ jobs:
32 32
   upload_docs_wheels:
33 33
     machine: True
34 34
     steps:
35
-      - run:
36
-          command: |
37
-            echo 'export MESONARGS=""' >> $BASH_ENV 
38 35
       - checkout
39 36
       - attach_workspace:
40 37
           at: workspace
@@ -46,21 +43,21 @@ jobs:
46 43
     steps:
47 44
       - checkout
48 45
       - run: docker pull deltachat/coredeps
49
-      - run:
50
-          command: |
51
-            echo 'export MESONARGS="-Dmonolith=true"' >> $BASH_ENV
52
-            echo 'export TESTS=1' >> $BASH_ENV 
53
-      - run: ci_scripts/ci_run.sh
46
+      - run: 
47
+          environment:
48
+            MESONARGS: -Dmonolith=true
49
+            TESTS: 1
50
+          command: ci_scripts/ci_run.sh
54 51
 
55 52
   build_static:
56 53
     machine: True
57 54
     steps:
58 55
       - checkout
59 56
       - run: docker pull deltachat/coredeps
60
-      - run:
61
-          command: |
62
-            echo 'export MESONARGS="--default-library=static"' >> $BASH_ENV
63
-      - run: ci_scripts/ci_run.sh
57
+      - run: 
58
+          environment:
59
+            MESONARGS: --default-library=static 
60
+          command: ci_scripts/ci_run.sh
64 61
 
65 62
   build_forcefallback: 
66 63
     machine: True
@@ -68,9 +65,9 @@ jobs:
68 65
       - checkout
69 66
       - run: docker pull deltachat/coredeps
70 67
       - run:
71
-          command: |
72
-            echo 'export MESONARGS="--wrap-mode=forcefallback --default-library=static"' >> $BASH_ENV
73
-      - run: ci_scripts/ci_run.sh
68
+          environment:
69
+            MESONARGS: --wrap-mode=forcefallback --default-library=static
70
+          command: ci_scripts/ci_run.sh
74 71
 
75 72
 workflows:
76 73
   version: 2