From 7eb6d2146774b971939c62e5fc0d861249a535b7 Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Sat, 9 Feb 2019 09:27:39 +0300 Subject: [PATCH 01/23] Fix #25 - run rustfmt, cargo build and make :D --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ef6c822..18ead32 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,4 +32,8 @@ matrix: node_js: "8" env: CXX=g++-4.8 TEST_SUITE=test -script: npm run $TEST_SUITE \ No newline at end of file +script: + - npm run $TEST_SUITE + - rustfmt + - cargo build + - make From ff21403ae0e2adc90b66805bf451e8ab245c1e58 Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Sat, 9 Feb 2019 09:37:11 +0300 Subject: [PATCH 02/23] Cleanup Travis matrix --- .travis.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 18ead32..d584b55 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,4 @@ -sudo: false -os: - - linux - -language: node_js -node_js: - - "8" +language: rust addons: apt: From faaa0a6a8d44e9c73a0d49bae238276a245183ff Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Sat, 9 Feb 2019 09:44:37 +0300 Subject: [PATCH 03/23] Use "new" Ubuntu 16.04 image --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index d584b55..fd74d92 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: rust +dist: xenial addons: apt: From e4f37d35aa7330506d9ca8b7e4fa0abb00313054 Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Sat, 9 Feb 2019 09:57:11 +0300 Subject: [PATCH 04/23] Split matrix in Js and Rust part --- .travis.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index fd74d92..716c6d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,3 @@ -language: rust dist: xenial addons: @@ -17,18 +16,20 @@ branches: 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 + script: + - npm run $TEST_SUITE -script: - - npm run $TEST_SUITE - - rustfmt - - cargo build - - make + - language: rust + install: + - rustup component add rustfmt + script: + - rustfmt + - cargo build + - make From c2b5252848f4339274436b1427dbf96a2c66a2d9 Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Sat, 9 Feb 2019 10:04:57 +0300 Subject: [PATCH 05/23] Remove strange env and run rustfmt properly --- .travis.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 716c6d3..895ec9f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,10 +13,6 @@ branches: only: - master -env: - global: - - DISPLAY=:99.0 - matrix: fast_finish: true include: @@ -30,6 +26,7 @@ matrix: install: - rustup component add rustfmt script: - - rustfmt + # the useful way to run rustfmt + - cargo fmt --all -- --check - cargo build - make From e0888e588eb4da39803d9177736509e19eaa7e0c Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Sat, 9 Feb 2019 10:12:04 +0300 Subject: [PATCH 06/23] Remove ubuntu-toolchain-r-test, add Rust asm.js --- .travis.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 895ec9f..e1371fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,5 @@ dist: xenial -addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 - 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. @@ -25,6 +18,7 @@ matrix: - language: rust install: - rustup component add rustfmt + - rustup target add asmjs-unknown-emscripten script: # the useful way to run rustfmt - cargo fmt --all -- --check From de9bbcdf57f351dc7777068433bfbf3930d55298 Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Sat, 9 Feb 2019 11:46:42 +0300 Subject: [PATCH 07/23] Remove CXX from JS test and install Emscripten --- .travis.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e1371fd..0758b0b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,16 +11,22 @@ matrix: include: - 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 + # install emsdk + - git clone https://github.com/emscripten-core/emsdk.git + - ./emsdk/emsdk install latest + - ./emsdk/emsdk activate latest - rustup target add asmjs-unknown-emscripten script: # the useful way to run rustfmt - cargo fmt --all -- --check + # activate Emscripten + - source ./emsdk/emsdk_env.sh - cargo build - make From e3690f611c9a84fcef9e8e9c251f1140975b5916 Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Sat, 9 Feb 2019 12:12:16 +0300 Subject: [PATCH 08/23] Use incoming version of Emscripten SDK --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0758b0b..4c9cd35 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,8 +20,8 @@ matrix: - rustup component add rustfmt # install emsdk - git clone https://github.com/emscripten-core/emsdk.git - - ./emsdk/emsdk install latest - - ./emsdk/emsdk activate latest + - ./emsdk/emsdk install sdk-incoming-64bit + - ./emsdk/emsdk activate sdk-incoming-64bit - rustup target add asmjs-unknown-emscripten script: # the useful way to run rustfmt From 498ca63a7a283097e9bb7316c28210b6a7d1e48d Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Wed, 13 Feb 2019 21:28:21 +0300 Subject: [PATCH 09/23] Use latest-incoming version of Emscripten SDK By advice from @kripken https://github.com/emscripten-core/emscripten/issues/8045#issuecomment-463261809 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4c9cd35..7c68141 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,8 +20,8 @@ matrix: - rustup component add rustfmt # install emsdk - git clone https://github.com/emscripten-core/emsdk.git - - ./emsdk/emsdk install sdk-incoming-64bit - - ./emsdk/emsdk activate sdk-incoming-64bit + - ./emsdk/emsdk install latest-incoming + - ./emsdk/emsdk activate latest-incoming - rustup target add asmjs-unknown-emscripten script: # the useful way to run rustfmt From 48c3233ac0a66a10242519e85c1918c661e07ff8 Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Wed, 13 Feb 2019 21:47:48 +0300 Subject: [PATCH 10/23] It is latest-upstream, not latest-incoming --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7c68141..a35fbac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,8 +20,8 @@ matrix: - rustup component add rustfmt # install emsdk - git clone https://github.com/emscripten-core/emsdk.git - - ./emsdk/emsdk install latest-incoming - - ./emsdk/emsdk activate latest-incoming + - ./emsdk/emsdk install latest-upstream + - ./emsdk/emsdk activate latest-upstream - rustup target add asmjs-unknown-emscripten script: # the useful way to run rustfmt From 1e677f417a4b96c703c56c2f176772013d984b9f Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Thu, 14 Feb 2019 00:33:46 +0300 Subject: [PATCH 11/23] Let's try new latest which should be 1.38.27 now If it fails, then `./emsdk update-tags` might be needed. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a35fbac..0758b0b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,8 +20,8 @@ matrix: - rustup component add rustfmt # install emsdk - git clone https://github.com/emscripten-core/emsdk.git - - ./emsdk/emsdk install latest-upstream - - ./emsdk/emsdk activate latest-upstream + - ./emsdk/emsdk install latest + - ./emsdk/emsdk activate latest - rustup target add asmjs-unknown-emscripten script: # the useful way to run rustfmt From 403fd309f171348a75886ae6ffbb2bb00e900eca Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Fri, 15 Feb 2019 11:44:50 +0300 Subject: [PATCH 12/23] Use last good Rust/EmSDK --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0758b0b..27c28ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,12 +16,14 @@ matrix: - npm run $TEST_SUITE - language: rust + rust: "1.27.2" + env: EMSDK_VERSION=1.38.21 install: - rustup component add rustfmt # install emsdk - git clone https://github.com/emscripten-core/emsdk.git - - ./emsdk/emsdk install latest - - ./emsdk/emsdk activate latest + - ./emsdk/emsdk install $EMSDK_VERSION + - ./emsdk/emsdk activate $EMSDK_VERSION - rustup target add asmjs-unknown-emscripten script: # the useful way to run rustfmt From 111e5747d306645ae186e865cb0047296d8c5e28 Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Fri, 15 Feb 2019 11:52:54 +0300 Subject: [PATCH 13/23] No rustfmt for Rust 1.27.2 https://travis-ci.org/ethereumjs/rustbn.js/jobs/493650749#L201 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 27c28ba..61f2042 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ matrix: rust: "1.27.2" env: EMSDK_VERSION=1.38.21 install: - - rustup component add rustfmt + #- rustup component add rustfmt # install emsdk - git clone https://github.com/emscripten-core/emsdk.git - ./emsdk/emsdk install $EMSDK_VERSION From c0d6934b00522651a851b7c7c183616533e137ff Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Fri, 15 Feb 2019 11:59:37 +0300 Subject: [PATCH 14/23] Be more explicit about sdk version Error: No tool or SDK found by name '1.38.21'. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 61f2042..a74fdc6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ matrix: - language: rust rust: "1.27.2" - env: EMSDK_VERSION=1.38.21 + env: EMSDK_VERSION=sdk-1.38.21 install: #- rustup component add rustfmt # install emsdk From 7916a2cb91a57cc1aa41ba33cf1c85dc84a036b6 Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Fri, 15 Feb 2019 12:05:34 +0300 Subject: [PATCH 15/23] EMSDK version needs suffix --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a74fdc6..fa4b9ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ matrix: - language: rust rust: "1.27.2" - env: EMSDK_VERSION=sdk-1.38.21 + env: EMSDK_VERSION=sdk-1.38.21-64bit install: #- rustup component add rustfmt # install emsdk From 07774ce8c9c6fc1157d5f9010b945d604338d0cd Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Tue, 19 Feb 2019 11:00:31 +0300 Subject: [PATCH 16/23] `cargo build` is not needed --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fa4b9ee..c311a63 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,5 +30,7 @@ matrix: - cargo fmt --all -- --check # activate Emscripten - source ./emsdk/emsdk_env.sh - - cargo build + # no need to run cargo build anymore + # https://github.com/ethereumjs/rustbn.js/pull/36/files#r257229082 + #- cargo build - make From 8d75f41fc6efcfc22eaea529ef7b67f298ba8f1a Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Thu, 1 Aug 2019 12:37:06 +0300 Subject: [PATCH 17/23] Try to compile on Travis with latest Rust and EMSDK --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c311a63..4bb452c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,8 +16,9 @@ matrix: - npm run $TEST_SUITE - language: rust - rust: "1.27.2" - env: EMSDK_VERSION=sdk-1.38.21-64bit + #rust: "1.27.2" + #env: EMSDK_VERSION=sdk-1.38.21-64bit + env: EMSDK_VERSION=latest install: #- rustup component add rustfmt # install emsdk From 9e2acebba92cc5b75da312bbbd1ad8c3edeb7477 Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Thu, 1 Aug 2019 12:49:58 +0300 Subject: [PATCH 18/23] Switch to Bionic and run `cargo fmt` as a separate job --- .travis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4bb452c..54f1341 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -dist: xenial +dist: bionic branches: # We need to whitelist the branches which we want to have "push" automation. @@ -15,6 +15,10 @@ matrix: script: - npm run $TEST_SUITE + - lanugage: rust + script: + - cargo fmt --all -- --check + - language: rust #rust: "1.27.2" #env: EMSDK_VERSION=sdk-1.38.21-64bit @@ -27,8 +31,6 @@ matrix: - ./emsdk/emsdk activate $EMSDK_VERSION - rustup target add asmjs-unknown-emscripten script: - # the useful way to run rustfmt - - cargo fmt --all -- --check # activate Emscripten - source ./emsdk/emsdk_env.sh # no need to run cargo build anymore From 551dd0f321f311ff37fb446c338e4cb3997b93e5 Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Thu, 1 Aug 2019 12:54:43 +0300 Subject: [PATCH 19/23] Fix typo in job language specifier --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 54f1341..f6de249 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ matrix: script: - npm run $TEST_SUITE - - lanugage: rust + - language: rust script: - cargo fmt --all -- --check From 511f66484d97e817275f9b0a5a142ee20b4a0d89 Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Thu, 1 Aug 2019 13:00:16 +0300 Subject: [PATCH 20/23] Install rustfmt --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f6de249..2418dd2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,8 @@ matrix: - npm run $TEST_SUITE - language: rust + install: + - rustup component add rustfmt script: - cargo fmt --all -- --check @@ -24,7 +26,6 @@ matrix: #env: EMSDK_VERSION=sdk-1.38.21-64bit env: EMSDK_VERSION=latest install: - #- rustup component add rustfmt # install emsdk - git clone https://github.com/emscripten-core/emsdk.git - ./emsdk/emsdk install $EMSDK_VERSION From de44a9a6cb6902a2df1286f927453653f1c4b73a Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Thu, 1 Aug 2019 13:12:35 +0300 Subject: [PATCH 21/23] Cleanup comments --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2418dd2..bc4b65b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,4 @@ matrix: script: # activate Emscripten - source ./emsdk/emsdk_env.sh - # no need to run cargo build anymore - # https://github.com/ethereumjs/rustbn.js/pull/36/files#r257229082 - #- cargo build - make From 4f0e93a9da2468108999c7c8500491ea7650a937 Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Sat, 15 Feb 2020 12:46:52 +0300 Subject: [PATCH 22/23] Try `latest-upstream` again For https://github.com/emscripten-core/emscripten/issues/8045#issuecomment-463261809 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bc4b65b..6f3e55b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ matrix: - language: rust #rust: "1.27.2" #env: EMSDK_VERSION=sdk-1.38.21-64bit - env: EMSDK_VERSION=latest + env: EMSDK_VERSION=latest-upstream install: # install emsdk - git clone https://github.com/emscripten-core/emsdk.git From 148874fdf7664a8163893ce55bf845ac33254c15 Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Thu, 5 Mar 2020 14:55:30 +0300 Subject: [PATCH 23/23] Commit CircleCI confit to make tests pass --- .circleci/config.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000..d2d4dd9 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,8 @@ +version: 2 +jobs: + build: + docker: + - image: circleci/ruby + steps: + - run: echo "Empty Circle CI config" +