daydream

commit 51caac9a8dc4158accaa9f953e27c9cdda8ffc74
parent 97a6c1a0726cc5495a78d89ee9387698d8572d9c
Author: Marcel <mtrnord1@gmail.com>
Date:   Sat, 13 Jun 2020 15:15:55 +0200

Switch tests to travisCI which hopefully have working firefox support

Took 16 minutes

Diffstat:
D
.github/workflows/test.yml
 | 
56
--------------------------------------------------------
M
tests/web.rs
 | 
1
+
A
travis.yml
 | 
40
++++++++++++++++++++++++++++++++++++++++

3 files changed, 41 insertions(+), 56 deletions(-)
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,56 +0,0 @@
-name: Test Daydream
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Setup Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-
-      - name: Setup nightly Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: nightly
-
-      - name: Setup Wasm Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          target: wasm32-unknown-unknown
-
-      - name: Setup Node
-        uses: actions/setup-node@v1
-        with:
-          node-version: 14
-
-      - name: Install
-        run: yarn
-
-      - name: Get emscripten SDK
-        run: wget https://github.com/emscripten-core/emsdk/archive/master.zip && unzip master.zip && ./emsdk-master/emsdk install latest && ./emsdk-master/emsdk activate latest
-
-      - name: Build
-        run: source emsdk-master/emsdk_env.sh && yarn run build:dev
-
-      - name: Install matrix-test-server
-        run: |
-          cargo +nightly install --git https://github.com/MTRNord/matrixclient-testsuite
-          mxctest &
-
-      - name: Run tests
-        run: |
-          export DISPLAY=:99
-          sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
-          cargo test
diff --git a/tests/web.rs b/tests/web.rs
@@ -23,6 +23,7 @@ async fn test_browser() {
     let joinable_two = thread::spawn(move || {
         let _process = match Command::new("geckodriver")
             .args(&["--port=4444"])
+            .env("DISPLAY", ":99")
             .spawn()
         {
             Ok(process) => process,
diff --git a/travis.yml b/travis.yml
@@ -0,0 +1,40 @@
+language: rust
+sudo: false
+
+INSTALL_NODE_VIA_NVM: &INSTALL_NODE_VIA_NVM
+                        |
+                        rustup target add wasm32-unknown-unknown
+                        curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.8/install.sh | bash
+                        source ~/.nvm/nvm.sh
+                        nvm install lts/carbon
+
+# Cache `cargo install`ed tools, but don't cache the project's `target`
+# directory (which ends up over-caching and filling all disk space!)
+cache:
+  directories:
+    - /home/travis/.cargo
+
+matrix:
+  include:
+
+    - name: Tests
+      rust: stable
+      env:
+        global:
+          - RUST_BACKTRACE=1
+          - MOZ_HEADLESS=1
+      addons:
+        firefox: latest
+      install:
+        - *INSTALL_NODE_VIA_NVM
+        - export PATH="$PATH:$HOME/.cargo/bin"
+        - rustup target add wasm32-unknown-unknown || true
+        - rustup toolchain install nightly
+        - yarn
+        - wget https://github.com/emscripten-core/emsdk/archive/master.zip && unzip master.zip && ./emsdk-master/emsdk install latest && ./emsdk-master/emsdk activate latest
+        - cargo +nightly install --git https://github.com/MTRNord/matrixclient-testsuite
+      script:
+        - source emsdk-master/emsdk_env.sh && yarn run build:dev
+        - mxctest &
+        - cargo test --all --locked
+