From 3efd535ab4c04371a67092a49102c413933b3257 Mon Sep 17 00:00:00 2001 From: jeremiG Date: Fri, 11 Jan 2019 21:43:42 -0500 Subject: [PATCH 01/27] feat(ci): Provide circleci build file - Tested locally only make failed (no emcc!) - Built a Docker image for emcc-rust - Published Docker image - Checking to see if CircleCI will work (will) Fixes: #25 --- circle.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 circle.yml diff --git a/circle.yml b/circle.yml new file mode 100644 index 0000000..e81edf3 --- /dev/null +++ b/circle.yml @@ -0,0 +1,20 @@ +version: 2 + +jobs: + build: + docker: + - image: jeremigendron/emcc-rust:ubuntu + steps: + - checkout + - run: + name: Check formatting + command: | + rustfmt --version + cargo fmt + git diff --exit-code + - run: + name: Cargo Build + command: cargo build --release --target asmjs-unknown-emscripten + - run: + name: Make All + command: make From 2cf2be8ea4ca22b911c3b17ca14b23a839530d51 Mon Sep 17 00:00:00 2001 From: jeremiG Date: Sat, 12 Jan 2019 00:21:05 -0500 Subject: [PATCH 02/27] use existing Dockerfile --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index e81edf3..309222d 100644 --- a/circle.yml +++ b/circle.yml @@ -3,7 +3,7 @@ version: 2 jobs: build: docker: - - image: jeremigendron/emcc-rust:ubuntu + - image: jeremigendron/rust-asmjs-wasm steps: - checkout - run: From cd63c636745ee1cffcae23877ccc507b20665931 Mon Sep 17 00:00:00 2001 From: jeremiG Date: Sat, 12 Jan 2019 00:32:05 -0500 Subject: [PATCH 03/27] testing --- circle.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index 309222d..1052759 100644 --- a/circle.yml +++ b/circle.yml @@ -3,9 +3,18 @@ version: 2 jobs: build: docker: - - image: jeremigendron/rust-asmjs-wasm + - image: procrat/rust-asmjs steps: - checkout + - run: + name: Init emcc + command: | + emcc --version + - run: + name: Install deps + command: | + rustup component add rustfmt-preview + rustup update - run: name: Check formatting command: | @@ -13,7 +22,7 @@ jobs: cargo fmt git diff --exit-code - run: - name: Cargo Build + name: Cargo build command: cargo build --release --target asmjs-unknown-emscripten - run: name: Make All From b0d15d85402de95d7345e1651a86e9a53efd4e32 Mon Sep 17 00:00:00 2001 From: jeremiG Date: Sat, 12 Jan 2019 00:46:51 -0500 Subject: [PATCH 04/27] uses custom --- circle.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/circle.yml b/circle.yml index 1052759..470879a 100644 --- a/circle.yml +++ b/circle.yml @@ -3,18 +3,9 @@ version: 2 jobs: build: docker: - - image: procrat/rust-asmjs + - image: jeremigendron/rustbn_js steps: - checkout - - run: - name: Init emcc - command: | - emcc --version - - run: - name: Install deps - command: | - rustup component add rustfmt-preview - rustup update - run: name: Check formatting command: | From f69d162a478a9a14193db9638f72715e57b8c8ef Mon Sep 17 00:00:00 2001 From: jeremiG Date: Sat, 12 Jan 2019 00:49:11 -0500 Subject: [PATCH 05/27] custom? --- circle.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/circle.yml b/circle.yml index 470879a..3f9313f 100644 --- a/circle.yml +++ b/circle.yml @@ -6,6 +6,10 @@ jobs: - image: jeremigendron/rustbn_js steps: - checkout + - run: + name: Link emcc + command: | + emcc --version - run: name: Check formatting command: | From ac676209c76847633178a1190f2bdfd6558b9014 Mon Sep 17 00:00:00 2001 From: jeremiG Date: Sat, 12 Jan 2019 02:20:37 -0500 Subject: [PATCH 06/27] another attempt --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 3f9313f..82d7ef9 100644 --- a/circle.yml +++ b/circle.yml @@ -3,7 +3,7 @@ version: 2 jobs: build: docker: - - image: jeremigendron/rustbn_js + - image: jeremigendron/custom-test steps: - checkout - run: From c911817b4991ff58e2ff0f0798bef15e2b8f6b5a Mon Sep 17 00:00:00 2001 From: jeremiG Date: Sat, 12 Jan 2019 02:22:23 -0500 Subject: [PATCH 07/27] another attempt --- circle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/circle.yml b/circle.yml index 82d7ef9..f3471b7 100644 --- a/circle.yml +++ b/circle.yml @@ -9,6 +9,7 @@ jobs: - run: name: Link emcc command: | + source /root/emsdk-portable/emsdk_env.sh emcc --version - run: name: Check formatting From 2230ea8b4d6b22715a7fcb3c2165e9c3a5002062 Mon Sep 17 00:00:00 2001 From: jeremiG Date: Sat, 12 Jan 2019 02:24:20 -0500 Subject: [PATCH 08/27] another attempt --- circle.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index f3471b7..92150c2 100644 --- a/circle.yml +++ b/circle.yml @@ -7,10 +7,11 @@ jobs: steps: - checkout - run: - name: Link emcc + name: Get deps command: | source /root/emsdk-portable/emsdk_env.sh emcc --version + rustup component add rustfmt - run: name: Check formatting command: | From 6265fbc2a397f608dcf8ca381a3c474be8019fda Mon Sep 17 00:00:00 2001 From: jeremiG Date: Sat, 12 Jan 2019 02:27:29 -0500 Subject: [PATCH 09/27] another attempt --- circle.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index 92150c2..39d861b 100644 --- a/circle.yml +++ b/circle.yml @@ -20,7 +20,11 @@ jobs: git diff --exit-code - run: name: Cargo build - command: cargo build --release --target asmjs-unknown-emscripten + command: | + source /root/.bashrc + cargo build --release --target asmjs-unknown-emscripten - run: name: Make All - command: make + command: | + source /root/.bashrc + make From e3bea6062fc295441b97763ae526be9c10afa0da Mon Sep 17 00:00:00 2001 From: jeremiG Date: Sat, 12 Jan 2019 02:30:44 -0500 Subject: [PATCH 10/27] another attempt --- circle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index 39d861b..fb8ad3a 100644 --- a/circle.yml +++ b/circle.yml @@ -21,10 +21,10 @@ jobs: - run: name: Cargo build command: | - source /root/.bashrc + source /root/emsdk-portable/emsdk_env.sh cargo build --release --target asmjs-unknown-emscripten - run: name: Make All command: | - source /root/.bashrc + source /root/emsdk-portable/emsdk_env.sh make From df7a7680265a8f174e80a07346c75f94d4cc4192 Mon Sep 17 00:00:00 2001 From: jeremiG Date: Sat, 12 Jan 2019 02:36:29 -0500 Subject: [PATCH 11/27] another attempt --- circle.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/circle.yml b/circle.yml index fb8ad3a..5bc0dba 100644 --- a/circle.yml +++ b/circle.yml @@ -11,10 +11,12 @@ jobs: command: | source /root/emsdk-portable/emsdk_env.sh emcc --version + rustup override set nightly rustup component add rustfmt - run: name: Check formatting command: | + rustup override set nightly rustfmt --version cargo fmt git diff --exit-code @@ -22,9 +24,11 @@ jobs: name: Cargo build command: | source /root/emsdk-portable/emsdk_env.sh + rustup override set nightly cargo build --release --target asmjs-unknown-emscripten - run: name: Make All command: | source /root/emsdk-portable/emsdk_env.sh + rustup override set nightly make From 72f555c718dc221641f3a4f84e3e99c917a44490 Mon Sep 17 00:00:00 2001 From: jeremiG Date: Sat, 12 Jan 2019 02:38:58 -0500 Subject: [PATCH 12/27] another attempt --- circle.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/circle.yml b/circle.yml index 5bc0dba..14a5fea 100644 --- a/circle.yml +++ b/circle.yml @@ -13,6 +13,9 @@ jobs: emcc --version rustup override set nightly rustup component add rustfmt + rustup target add wasm32-unknown-emscripten + rustup target add asmjs-unknown-emscripten + - run: name: Check formatting command: | From bb148367b1520941f70dd611f92e131103eafa3d Mon Sep 17 00:00:00 2001 From: jeremiG Date: Sat, 12 Jan 2019 02:45:38 -0500 Subject: [PATCH 13/27] commit --- circleci.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 circleci.yml diff --git a/circleci.yml b/circleci.yml new file mode 100644 index 0000000..ed0402f --- /dev/null +++ b/circleci.yml @@ -0,0 +1,24 @@ +version: 2 + +jobs: + build: + docker: + - image: rust:1 + steps: + - checkout + - run: + name: Update rustc + command: | + rustup target add wasm32-unknown-unknown + rustup target add asmjs-unknown-emscripten + rustup component add rustfmt-preview + rustup update + - run: + name: Check formatting + command: | + rustfmt --version + cargo fmt + git diff --exit-code + - run: + name: Make + command: make From 829e6819b8431fcd91914d46235c034ff86d88c9 Mon Sep 17 00:00:00 2001 From: jeremiG Date: Sat, 12 Jan 2019 02:48:06 -0500 Subject: [PATCH 14/27] move --- circle.yml | 27 +++++++-------------------- circleci.yml | 24 ------------------------ 2 files changed, 7 insertions(+), 44 deletions(-) delete mode 100644 circleci.yml diff --git a/circle.yml b/circle.yml index 14a5fea..ed0402f 100644 --- a/circle.yml +++ b/circle.yml @@ -3,35 +3,22 @@ version: 2 jobs: build: docker: - - image: jeremigendron/custom-test + - image: rust:1 steps: - checkout - run: - name: Get deps + name: Update rustc command: | - source /root/emsdk-portable/emsdk_env.sh - emcc --version - rustup override set nightly - rustup component add rustfmt - rustup target add wasm32-unknown-emscripten + rustup target add wasm32-unknown-unknown rustup target add asmjs-unknown-emscripten - + rustup component add rustfmt-preview + rustup update - run: name: Check formatting command: | - rustup override set nightly rustfmt --version cargo fmt git diff --exit-code - run: - name: Cargo build - command: | - source /root/emsdk-portable/emsdk_env.sh - rustup override set nightly - cargo build --release --target asmjs-unknown-emscripten - - run: - name: Make All - command: | - source /root/emsdk-portable/emsdk_env.sh - rustup override set nightly - make + name: Make + command: make diff --git a/circleci.yml b/circleci.yml deleted file mode 100644 index ed0402f..0000000 --- a/circleci.yml +++ /dev/null @@ -1,24 +0,0 @@ -version: 2 - -jobs: - build: - docker: - - image: rust:1 - steps: - - checkout - - run: - name: Update rustc - command: | - rustup target add wasm32-unknown-unknown - rustup target add asmjs-unknown-emscripten - rustup component add rustfmt-preview - rustup update - - run: - name: Check formatting - command: | - rustfmt --version - cargo fmt - git diff --exit-code - - run: - name: Make - command: make From ea56c6276b304ce5e6873f256063ea4b26c3e445 Mon Sep 17 00:00:00 2001 From: jeremiG Date: Sat, 12 Jan 2019 03:05:28 -0500 Subject: [PATCH 15/27] lets go! --- circle.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/circle.yml b/circle.yml index ed0402f..2357d21 100644 --- a/circle.yml +++ b/circle.yml @@ -3,16 +3,9 @@ version: 2 jobs: build: docker: - - image: rust:1 + - image: jeremigendron/rust-emcc steps: - checkout - - run: - name: Update rustc - command: | - rustup target add wasm32-unknown-unknown - rustup target add asmjs-unknown-emscripten - rustup component add rustfmt-preview - rustup update - run: name: Check formatting command: | From 440d358968f217e34a186838f327427e076a1296 Mon Sep 17 00:00:00 2001 From: jeremiG Date: Sat, 12 Jan 2019 03:08:38 -0500 Subject: [PATCH 16/27] lets go! --- circle.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/circle.yml b/circle.yml index 2357d21..94e36c4 100644 --- a/circle.yml +++ b/circle.yml @@ -9,6 +9,8 @@ jobs: - run: name: Check formatting command: | + . /root/.cargo/env + . /emsdk-portable/emsdk_env.sh rustfmt --version cargo fmt git diff --exit-code From c54810233cba13cdd12ed3b42749a2226c53e116 Mon Sep 17 00:00:00 2001 From: jeremiG Date: Sat, 12 Jan 2019 03:09:56 -0500 Subject: [PATCH 17/27] lets go! --- circle.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/circle.yml b/circle.yml index 94e36c4..3cbbc42 100644 --- a/circle.yml +++ b/circle.yml @@ -7,13 +7,11 @@ jobs: steps: - checkout - run: - name: Check formatting + name: Go command: | . /root/.cargo/env . /emsdk-portable/emsdk_env.sh rustfmt --version cargo fmt git diff --exit-code - - run: - name: Make - command: make + make From 80e1105cce57439d69994309939fb2fd0f022098 Mon Sep 17 00:00:00 2001 From: jeremiG Date: Sat, 12 Jan 2019 03:11:46 -0500 Subject: [PATCH 18/27] wasm? --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 3cbbc42..ac5ac7b 100644 --- a/circle.yml +++ b/circle.yml @@ -14,4 +14,4 @@ jobs: rustfmt --version cargo fmt git diff --exit-code - make + make wasm From a3405690bb48b89ae1ba1ca94ad60989e2ac0039 Mon Sep 17 00:00:00 2001 From: jeremiG Date: Sat, 12 Jan 2019 03:16:53 -0500 Subject: [PATCH 19/27] wasm? --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index ac5ac7b..1e15ce5 100644 --- a/circle.yml +++ b/circle.yml @@ -14,4 +14,4 @@ jobs: rustfmt --version cargo fmt git diff --exit-code - make wasm + sudo make From eb8fe99fa94b529cbec410abbb2a587138aabeb0 Mon Sep 17 00:00:00 2001 From: jeremiG Date: Sat, 12 Jan 2019 03:18:17 -0500 Subject: [PATCH 20/27] whoami --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 1e15ce5..299019e 100644 --- a/circle.yml +++ b/circle.yml @@ -14,4 +14,4 @@ jobs: rustfmt --version cargo fmt git diff --exit-code - sudo make + whoami From 6ff4714cf48598133a2790522169aba7659f858d Mon Sep 17 00:00:00 2001 From: jeremiG Date: Sat, 12 Jan 2019 03:37:21 -0500 Subject: [PATCH 21/27] original --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 299019e..b5a99ef 100644 --- a/circle.yml +++ b/circle.yml @@ -3,7 +3,7 @@ version: 2 jobs: build: docker: - - image: jeremigendron/rust-emcc + - image: jeremigendron/nice steps: - checkout - run: From 14f34d5dd6e5f4060d263f1ae15a5f6aaf906c81 Mon Sep 17 00:00:00 2001 From: jeremiG Date: Sat, 12 Jan 2019 03:40:10 -0500 Subject: [PATCH 22/27] original --- circle.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/circle.yml b/circle.yml index b5a99ef..f272402 100644 --- a/circle.yml +++ b/circle.yml @@ -9,9 +9,9 @@ jobs: - run: name: Go command: | - . /root/.cargo/env - . /emsdk-portable/emsdk_env.sh + echo $PATH + emcc --version rustfmt --version cargo fmt git diff --exit-code - whoami + make From c0ca9efebbef43a5da67473b23c06bb8a7768572 Mon Sep 17 00:00:00 2001 From: jeremiG Date: Sat, 12 Jan 2019 03:44:01 -0500 Subject: [PATCH 23/27] original --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index f272402..d816f12 100644 --- a/circle.yml +++ b/circle.yml @@ -9,7 +9,7 @@ jobs: - run: name: Go command: | - echo $PATH + source /root/emsdk-master/emsdk_env.sh emcc --version rustfmt --version cargo fmt From 152e8e340bdd3aa59d784be58cbd390eae417d52 Mon Sep 17 00:00:00 2001 From: jeremiG Date: Sat, 12 Jan 2019 03:46:56 -0500 Subject: [PATCH 24/27] original --- circle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/circle.yml b/circle.yml index d816f12..134fe35 100644 --- a/circle.yml +++ b/circle.yml @@ -10,6 +10,7 @@ jobs: name: Go command: | source /root/emsdk-master/emsdk_env.sh + source ~/.bashrc emcc --version rustfmt --version cargo fmt From adc752daf9b9b48ee0f713ebc2d7056c3295933c Mon Sep 17 00:00:00 2001 From: jeremiG Date: Sat, 12 Jan 2019 03:48:43 -0500 Subject: [PATCH 25/27] original --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 134fe35..00b5840 100644 --- a/circle.yml +++ b/circle.yml @@ -10,7 +10,7 @@ jobs: name: Go command: | source /root/emsdk-master/emsdk_env.sh - source ~/.bashrc + source /root/.cargo/env emcc --version rustfmt --version cargo fmt From 4e2bcd77b6d4256af18daca000b5e66756888a4e Mon Sep 17 00:00:00 2001 From: jeremiG Date: Sat, 12 Jan 2019 04:01:30 -0500 Subject: [PATCH 26/27] magic --- circle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/circle.yml b/circle.yml index 00b5840..46fd4b9 100644 --- a/circle.yml +++ b/circle.yml @@ -11,6 +11,7 @@ jobs: command: | source /root/emsdk-master/emsdk_env.sh source /root/.cargo/env + export PATH=$PATH:/root/emsdk-master/clang/*/ emcc --version rustfmt --version cargo fmt From 9a9942908acd51f274b56a70b094ed4c51241678 Mon Sep 17 00:00:00 2001 From: jeremiG Date: Sat, 12 Jan 2019 04:03:37 -0500 Subject: [PATCH 27/27] magic --- circle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/circle.yml b/circle.yml index 46fd4b9..676662f 100644 --- a/circle.yml +++ b/circle.yml @@ -12,6 +12,7 @@ jobs: source /root/emsdk-master/emsdk_env.sh source /root/.cargo/env export PATH=$PATH:/root/emsdk-master/clang/*/ + llvm-nm --version emcc --version rustfmt --version cargo fmt