Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
7eb6d21
Fix #25 - run rustfmt, cargo build and make
abitrolly Feb 9, 2019
ff21403
Cleanup Travis matrix
abitrolly Feb 9, 2019
faaa0a6
Use "new" Ubuntu 16.04 image
abitrolly Feb 9, 2019
e4f37d3
Split matrix in Js and Rust part
abitrolly Feb 9, 2019
c2b5252
Remove strange env and run rustfmt properly
abitrolly Feb 9, 2019
e0888e5
Remove ubuntu-toolchain-r-test, add Rust asm.js
abitrolly Feb 9, 2019
de9bbcd
Remove CXX from JS test and install Emscripten
abitrolly Feb 9, 2019
e3690f6
Use incoming version of Emscripten SDK
abitrolly Feb 9, 2019
498ca63
Use latest-incoming version of Emscripten SDK
abitrolly Feb 13, 2019
48c3233
It is latest-upstream, not latest-incoming
abitrolly Feb 13, 2019
1e677f4
Let's try new latest which should be 1.38.27 now
abitrolly Feb 13, 2019
403fd30
Use last good Rust/EmSDK
abitrolly Feb 15, 2019
111e574
No rustfmt for Rust 1.27.2
abitrolly Feb 15, 2019
c0d6934
Be more explicit about sdk version
abitrolly Feb 15, 2019
7916a2c
EMSDK version needs suffix
abitrolly Feb 15, 2019
07774ce
`cargo build` is not needed
abitrolly Feb 19, 2019
8d75f41
Try to compile on Travis with latest Rust and EMSDK
abitrolly Aug 1, 2019
9e2aceb
Switch to Bionic and run `cargo fmt` as a separate job
abitrolly Aug 1, 2019
551dd0f
Fix typo in job language specifier
abitrolly Aug 1, 2019
511f664
Install rustfmt
abitrolly Aug 1, 2019
de44a9a
Cleanup comments
abitrolly Aug 1, 2019
4f0e93a
Try `latest-upstream` again
abitrolly Feb 15, 2020
148874f
Commit CircleCI confit to make tests pass
abitrolly Mar 5, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
version: 2
jobs:
build:
docker:
- image: circleci/ruby
steps:
- run: echo "Empty Circle CI config"

48 changes: 25 additions & 23 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,35 +1,37 @@
sudo: false
os:
- linux

language: node_js
node_js:
- "8"

addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-4.8
dist: bionic

branches:
# We need to whitelist the branches which we want to have "push" automation.
# Pull request automation is not constrained to this set of branches.
only:
- master

env:
global:
- DISPLAY=:99.0
matrix:
- CXX=g++-4.8 TEST_SUITE=test

matrix:
fast_finish: true
include:
- os: linux
- language: node_js
node_js: "8"
env: CXX=g++-4.8 TEST_SUITE=test
env: TEST_SUITE=test
script:
- npm run $TEST_SUITE

- language: rust
install:
- rustup component add rustfmt
script:
- cargo fmt --all -- --check

script: npm run $TEST_SUITE
- language: rust
#rust: "1.27.2"
#env: EMSDK_VERSION=sdk-1.38.21-64bit
env: EMSDK_VERSION=latest-upstream
install:
# install emsdk
- git clone https://github.com/emscripten-core/emsdk.git
- ./emsdk/emsdk install $EMSDK_VERSION
- ./emsdk/emsdk activate $EMSDK_VERSION
- rustup target add asmjs-unknown-emscripten
script:
# activate Emscripten
- source ./emsdk/emsdk_env.sh
- make