add env

.github/workflows/rust.yml

@@ -0,0 +1,30 @@
+name: CI
+
+on:
+  pull_request:
+  push:
+
+env:
+  RUSTFLAGS: -Dwarnings
+
+jobs:
+  build:
+    name: 3.7 python tests against core
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+
+      - uses: actions-rs/toolchain@v1
+        with:
+           profile: minimal
+           toolchain: nightly
+           override: true
+           components: rustfmt
+
+      - name: Setup python
+        uses: actions/setup-python@v1
+        with:
+          python-version: 3.x
+          architecture: x64
+
+      - run: bash ci_scripts/run-python.sh 

ci_scripts/gh-actions-rust.yml

@@ -1,77 +0,0 @@
-name: CI
-
-on:
-  pull_request:
-  push:
-
-env:
-  RUSTFLAGS: -Dwarnings
-
-jobs:
-  build_and_test:
-    name: Build and test
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest, macOS-latest]
-        rust: [nightly]
-
-    steps:
-    - uses: actions/checkout@master
-
-    - name: Install ${{ matrix.rust }}
-      uses: actions-rs/toolchain@v1
-      with:
-        toolchain: ${{ matrix.rust }}
-        override: true
-
-    - name: check
-      uses: actions-rs/cargo@v1
-      if: matrix.rust == 'nightly'
-      with:
-        command:  check
-        args: --all --bins --examples --tests
-
-    - name: tests
-      uses: actions-rs/cargo@v1
-      with:
-        command: test
-        args: --all
-
-    - name: tests ignored
-      uses: actions-rs/cargo@v1
-      with:
-        command: test
-        args: --all --release -- --ignored
-
-  check_fmt:
-    name: Checking fmt and docs
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@master
-
-    - uses: actions-rs/toolchain@v1
-      with:
-          profile: minimal
-          toolchain: nightly
-          override: true
-          components: rustfmt
-
-    - name: fmt
-      run: cargo fmt --all -- --check
-
-#  clippy_check:
-#    name: Clippy check
-#    runs-on: ubuntu-latest
-#
-#    steps:
-#    - uses: actions/checkout@v1
-#    - uses: actions-rs/toolchain@v1
-#      with:
-#          profile: minimal
-#          toolchain: nightly
-#          override: true
-#          components: clippy
-#
-#    - name: clippy
-#      run: cargo clippy --all

ci_scripts/run-python.sh

@@ -13,7 +13,6 @@ export TOXWORKDIR=.docker-tox
 
 export PATH=/root/.cargo/bin:$PATH
 cargo build --release -p deltachat_ffi
-# cargo test --all --all-features
 
 # Statically link against libdeltachat.a.
 export DCC_RS_DEV=$(pwd)
@@ -22,36 +21,27 @@ export DCC_RS_DEV=$(pwd)
 # needed by tox below.
 export PATH=$PATH:/opt/python/cp35-cp35m/bin
 export PYTHONDONTWRITEBYTECODE=1
-pushd /bin
-ln -s /opt/python/cp27-cp27m/bin/python2.7
-ln -s /opt/python/cp36-cp36m/bin/python3.6
-ln -s /opt/python/cp37-cp37m/bin/python3.7
+
+pushd python
+# prepare a clean tox run
+rm -rf tests/__pycache__
+rm -rf src/deltachat/__pycache__
+export PYTHONDONTWRITEBYTECODE=1
+
+# run tox. The circle-ci project env-var-setting DCC_PY_LIVECONFIG 
+# allows running of "liveconfig" tests but for speed reasons
+# we run them only for the highest python version we support
+
+# we split out qr-tests run to minimize likelyness of flaky tests
+# (some qr tests are pretty heavy in terms of send/received
+# messages and rust's imap code likely has concurrency problems) 
+tox --workdir "$TOXWORKDIR" -e py37 -- --reruns 3 -k "not qr"
+tox --workdir "$TOXWORKDIR" -e py37 -- --reruns 3 -k "qr"
+unset DCC_PY_LIVECONFIG
+#tox --workdir "$TOXWORKDIR" -p4 -e lint,py35,py36,doc
+#tox --workdir "$TOXWORKDIR" -e auditwheels
 popd
 
-if [ -n "$TESTS" ]; then
-
-    pushd python
-    # prepare a clean tox run
-    rm -rf tests/__pycache__
-    rm -rf src/deltachat/__pycache__
-    export PYTHONDONTWRITEBYTECODE=1
-
-    # run tox. The circle-ci project env-var-setting DCC_PY_LIVECONFIG 
-    # allows running of "liveconfig" tests but for speed reasons
-    # we run them only for the highest python version we support
-    
-    # we split out qr-tests run to minimize likelyness of flaky tests
-    # (some qr tests are pretty heavy in terms of send/received
-    # messages and rust's imap code likely has concurrency problems) 
-    tox --workdir "$TOXWORKDIR" -e py37 -- --reruns 3 -k "not qr"
-    tox --workdir "$TOXWORKDIR" -e py37 -- --reruns 3 -k "qr"
-    unset DCC_PY_LIVECONFIG
-    tox --workdir "$TOXWORKDIR" -p4 -e lint,py35,py36,doc
-    tox --workdir "$TOXWORKDIR" -e auditwheels
-    popd
-fi
-
-
 # if [ -n "$DOCS" ]; then
 #     echo -----------------------
 #     echo generating python docs

ci_scripts/run-rust-test.sh

@@ -32,8 +32,8 @@ if [[ $NORUN == "1" ]]; then
     export CARGO_SUBCMD="build"
 else
     export CARGO_SUBCMD="test --all"
-    export OPT="-j1 ${OPT} "
-    export OPT_RELEASE="-j2 ${OPT_RELEASE} "
+    export OPT="${OPT} "
+    export OPT_RELEASE="${OPT_RELEASE} "
     export OPT_RELEASE_IGNORED="${OPT_RELEASE} -- --ignored"
 fi