From 780f7a08203450e52032dd7e68b9e215b6fbf64b Mon Sep 17 00:00:00 2001 From: Mazen Elkashef Date: Fri, 15 May 2020 14:32:22 -0500 Subject: [PATCH 01/22] Bump xcode to 10.3 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f0a68d8b..c37a5845 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ jobs: XCODE_PROJECT: test NODE_VERSION: '10.2.1' macos: - xcode: 8.3.3 + xcode: 10.3 steps: - checkout - run: From c3b77e47ae9b6d6c2451c536cc26ea4fa0521041 Mon Sep 17 00:00:00 2001 From: Mazen Elkashef Date: Fri, 15 May 2020 14:37:38 -0500 Subject: [PATCH 02/22] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c37a5845..5539b322 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ jobs: XCODE_PROJECT: test NODE_VERSION: '10.2.1' macos: - xcode: 10.3 + xcode: 10.14.4 steps: - checkout - run: From b321dfcae955a2e27014f5bf030971f58b8ed768 Mon Sep 17 00:00:00 2001 From: Mazen Elkashef Date: Fri, 15 May 2020 14:40:06 -0500 Subject: [PATCH 03/22] Update config.yml Still getting same error "failed to create host: Image xcode:10.14.4 is not supported", trying with the oldest supported version --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5539b322..ef786ecd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ jobs: XCODE_PROJECT: test NODE_VERSION: '10.2.1' macos: - xcode: 10.14.4 + xcode: 10.12.6 steps: - checkout - run: From e223850ff998ba88f65438c57151f747a2c038a7 Mon Sep 17 00:00:00 2001 From: Mazen Elkashef Date: Fri, 15 May 2020 14:42:37 -0500 Subject: [PATCH 04/22] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ef786ecd..0819c2a8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ jobs: XCODE_PROJECT: test NODE_VERSION: '10.2.1' macos: - xcode: 10.12.6 + xcode: 10.2.1 steps: - checkout - run: From 53d9a0f804e15ca098943f419eb110764e00e70b Mon Sep 17 00:00:00 2001 From: Mazen Elkashef Date: Fri, 15 May 2020 15:11:12 -0500 Subject: [PATCH 05/22] Update install-emscripten.sh --- script/install-emscripten.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/install-emscripten.sh b/script/install-emscripten.sh index 952cbcd4..d4af5e7b 100755 --- a/script/install-emscripten.sh +++ b/script/install-emscripten.sh @@ -2,7 +2,7 @@ set -e -EMSCRIPTEN_DOWNLOAD_URL='https://s3.amazonaws.com/mozilla-games/emscripten/releases/emsdk-portable.tar.gz' +EMSCRIPTEN_DOWNLOAD_URL='https://codeload.github.com/emscripten-core/emscripten/tar.gz/1.37.34' EMSDK_PATH="./emsdk-portable/emsdk" if [ ! -f $EMSDK_PATH ]; then From 03d29e00798b6a8a945bfef8ab25c6d9db452d4d Mon Sep 17 00:00:00 2001 From: Mazen Elkashef Date: Fri, 15 May 2020 15:17:36 -0500 Subject: [PATCH 06/22] Update install-emscripten.sh Correct EMSDK path --- script/install-emscripten.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/install-emscripten.sh b/script/install-emscripten.sh index d4af5e7b..a5ae8202 100755 --- a/script/install-emscripten.sh +++ b/script/install-emscripten.sh @@ -3,7 +3,7 @@ set -e EMSCRIPTEN_DOWNLOAD_URL='https://codeload.github.com/emscripten-core/emscripten/tar.gz/1.37.34' -EMSDK_PATH="./emsdk-portable/emsdk" +EMSDK_PATH="./emsdk" if [ ! -f $EMSDK_PATH ]; then echo 'Downloading emscripten SDK installer...' From 3d22ac44a0fb2a47838103ad52b98fbc603f112c Mon Sep 17 00:00:00 2001 From: Mazen Elkashef Date: Fri, 15 May 2020 15:24:19 -0500 Subject: [PATCH 07/22] Update install-emscripten.sh --- script/install-emscripten.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/script/install-emscripten.sh b/script/install-emscripten.sh index a5ae8202..b80d98fc 100755 --- a/script/install-emscripten.sh +++ b/script/install-emscripten.sh @@ -2,7 +2,7 @@ set -e -EMSCRIPTEN_DOWNLOAD_URL='https://codeload.github.com/emscripten-core/emscripten/tar.gz/1.37.34' +EMSCRIPTEN_DOWNLOAD_URL='https://codeload.github.com/emscripten-core/emsdk/tar.gz/1.39.16' EMSDK_PATH="./emsdk" if [ ! -f $EMSDK_PATH ]; then @@ -13,8 +13,8 @@ fi echo 'Installing emscripten SDK...' # Workaround https://github.com/juj/emsdk/pull/74 -sed -i{} "s_/kripken/emscripten/'_/kripken/emscripten'_" $EMSDK_PATH -sed -i{} "s_/WebAssembly/binaryen/'_/WebAssembly/binaryen'_" $EMSDK_PATH +#sed -i{} "s_/kripken/emscripten/'_/kripken/emscripten'_" $EMSDK_PATH +#sed -i{} "s_/WebAssembly/binaryen/'_/WebAssembly/binaryen'_" $EMSDK_PATH $EMSDK_PATH update $EMSDK_PATH list From 259badff18ae1677e1b349dc23c5a4ce7dff4b4a Mon Sep 17 00:00:00 2001 From: Mazen Elkashef Date: Fri, 15 May 2020 15:28:01 -0500 Subject: [PATCH 08/22] Update install-emscripten.sh --- script/install-emscripten.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/install-emscripten.sh b/script/install-emscripten.sh index b80d98fc..e6827e03 100755 --- a/script/install-emscripten.sh +++ b/script/install-emscripten.sh @@ -3,7 +3,7 @@ set -e EMSCRIPTEN_DOWNLOAD_URL='https://codeload.github.com/emscripten-core/emsdk/tar.gz/1.39.16' -EMSDK_PATH="./emsdk" +EMSDK_PATH="./emsdk-1.39.16/emsdk" if [ ! -f $EMSDK_PATH ]; then echo 'Downloading emscripten SDK installer...' From 180b933d56c2094a1a8e5758269570dfde1fb7d0 Mon Sep 17 00:00:00 2001 From: Mazen Elkashef Date: Fri, 15 May 2020 15:31:26 -0500 Subject: [PATCH 09/22] Update install-emscripten.sh --- script/install-emscripten.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/install-emscripten.sh b/script/install-emscripten.sh index e6827e03..b4d92473 100755 --- a/script/install-emscripten.sh +++ b/script/install-emscripten.sh @@ -18,5 +18,5 @@ echo 'Installing emscripten SDK...' $EMSDK_PATH update $EMSDK_PATH list -$EMSDK_PATH install sdk-1.37.9-64bit -$EMSDK_PATH activate sdk-1.37.9-64bit +$EMSDK_PATH install sdk-1.39.16-64bit +$EMSDK_PATH activate sdk-1.39.16-64bit From 36cbced271c2888294aefd3883cc0e3eb0ebf739 Mon Sep 17 00:00:00 2001 From: Mazen Elkashef Date: Fri, 15 May 2020 15:40:11 -0500 Subject: [PATCH 10/22] Update build-browser-version.sh --- script/build-browser-version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/build-browser-version.sh b/script/build-browser-version.sh index bb370e11..64f3011a 100755 --- a/script/build-browser-version.sh +++ b/script/build-browser-version.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -source emsdk-portable/emsdk_env.sh +source emsdk-1.39.16/emsdk_env.sh mkdir -p build From 285bf93094533726e5cb4b60bb96af61f8dd6f54 Mon Sep 17 00:00:00 2001 From: Mazen Elkashef Date: Fri, 15 May 2020 15:43:02 -0500 Subject: [PATCH 11/22] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0819c2a8..364bc2f3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -41,7 +41,7 @@ jobs: key: emsdk-{{ checksum "script/install-emscripten.sh" }} paths: - .emscripten_cache - - emsdk-portable + - emsdk-1.39.16 - run: name: Build emscripten command: npm run build:browser From 5a85c96263de11e4c18b82122f979d4215b40ac5 Mon Sep 17 00:00:00 2001 From: Mazen Elkashef Date: Fri, 15 May 2020 16:32:03 -0500 Subject: [PATCH 12/22] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 364bc2f3..14766063 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -41,7 +41,7 @@ jobs: key: emsdk-{{ checksum "script/install-emscripten.sh" }} paths: - .emscripten_cache - - emsdk-1.39.16 + - emsdk-1.38.48 - run: name: Build emscripten command: npm run build:browser From 5ea95961d88eb4cfc15e2ba968cc714ff0a9b3cf Mon Sep 17 00:00:00 2001 From: Mazen Elkashef Date: Fri, 15 May 2020 16:32:15 -0500 Subject: [PATCH 13/22] Update build-browser-version.sh --- script/build-browser-version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/build-browser-version.sh b/script/build-browser-version.sh index 64f3011a..76e42097 100755 --- a/script/build-browser-version.sh +++ b/script/build-browser-version.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -source emsdk-1.39.16/emsdk_env.sh +source emsdk-1.38.48/emsdk_env.sh mkdir -p build From b0f0476d34e880d47142bca0dc2683954cd14dd4 Mon Sep 17 00:00:00 2001 From: Mazen Elkashef Date: Fri, 15 May 2020 16:32:51 -0500 Subject: [PATCH 14/22] Update install-emscripten.sh --- script/install-emscripten.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/script/install-emscripten.sh b/script/install-emscripten.sh index b4d92473..81951f50 100755 --- a/script/install-emscripten.sh +++ b/script/install-emscripten.sh @@ -2,8 +2,8 @@ set -e -EMSCRIPTEN_DOWNLOAD_URL='https://codeload.github.com/emscripten-core/emsdk/tar.gz/1.39.16' -EMSDK_PATH="./emsdk-1.39.16/emsdk" +EMSCRIPTEN_DOWNLOAD_URL='https://codeload.github.com/emscripten-core/emsdk/tar.gz/1.38.48' +EMSDK_PATH="./emsdk-1.38.48/emsdk" if [ ! -f $EMSDK_PATH ]; then echo 'Downloading emscripten SDK installer...' @@ -18,5 +18,5 @@ echo 'Installing emscripten SDK...' $EMSDK_PATH update $EMSDK_PATH list -$EMSDK_PATH install sdk-1.39.16-64bit -$EMSDK_PATH activate sdk-1.39.16-64bit +$EMSDK_PATH install sdk-1.38.48-64bit +$EMSDK_PATH activate sdk-1.38.48-64bit From eced19499002916857c6b6c37745c4a0ca57e067 Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Thu, 28 May 2020 02:43:50 -0500 Subject: [PATCH 15/22] attempt replacing circle with github actions --- .circleci/config.yml | 59 ------------------------------------- .github/workflows/build.yml | 41 ++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 59 deletions(-) delete mode 100644 .circleci/config.yml create mode 100644 .github/workflows/build.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 14766063..00000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,59 +0,0 @@ -version: 2 - -jobs: - build: - environment: - XCODE_SCHEME: test - XCODE_WORKSPACE: test - XCODE_PROJECT: test - NODE_VERSION: '10.2.1' - macos: - xcode: 10.2.1 - steps: - - checkout - - run: - name: Update submodules - command: git submodule update --init - - restore_cache: - key: node-{{ .Environment.NODE_VERSION }} - - restore_cache: - key: emsdk-{{ checksum "script/install-emscripten.sh" }} - - run: - name: Install Node.js with nvm - command: | - export NVM_DIR=${HOME}/.nvm - curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.8/install.sh | bash - [ -s "${NVM_DIR}/nvm.sh" ] && \. "${NVM_DIR}/nvm.sh" - nvm install ${NODE_VERSION} - nvm alias default ${NODE_VERSION} - echo "[ -s \"${NVM_DIR}/nvm.sh\" ] && . \"${NVM_DIR}/nvm.sh\"" >> $BASH_ENV - - run: - name: Install node dependencies - command: npm install - - run: - name: Build with emscripten - command: script/install-emscripten.sh - - save_cache: - key: node-{{ .Environment.NODE_VERSION }} - paths: - - .nvm - - save_cache: - key: emsdk-{{ checksum "script/install-emscripten.sh" }} - paths: - - .emscripten_cache - - emsdk-1.38.48 - - run: - name: Build emscripten - command: npm run build:browser - - run: - name: Lint JavaScript - command: npm run standard - - run: - name: Test Browser - command: npm run test:browser - - run: - name: Test Node.js - command: npm run test:node - - run: - name: Test native - command: npm run test:native diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..e3f14fa5 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,41 @@ +name: Build + +on: + push: + +jobs: + build: + runs-on: macos-10.15 + env: + NODE_VERSION: '10.2.1' + steps: + - uses: actions/checkout@v2 + - name: Use Node.js + uses: actions/setup-node@v1 + with: + node-version: '10.x' + + - name: checkout + - run: git submodule update --init + + - name: Install node dependencies + - run: npm ci + + - name: Build with emscripten + - run: script/install-emscripten.sh + + - name: Build emscripten + - run: npm run build:browser + + - name: Lint JavaScript + - run: npm run standard + + - name: Test Browser + - run: npm run test:browser + + - name: Test Node.js + - run: npm run test:node + + - name: Test native + - run: npm run test:native + From cfe88f754b700ca872627598c8b528cc2c34a6c8 Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Thu, 28 May 2020 02:46:19 -0500 Subject: [PATCH 16/22] fix build.yml syntax --- .github/workflows/build.yml | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e3f14fa5..1143bbd8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,8 +6,6 @@ on: jobs: build: runs-on: macos-10.15 - env: - NODE_VERSION: '10.2.1' steps: - uses: actions/checkout@v2 - name: Use Node.js @@ -16,26 +14,26 @@ jobs: node-version: '10.x' - name: checkout - - run: git submodule update --init + run: git submodule update --init - name: Install node dependencies - - run: npm ci + run: npm ci - name: Build with emscripten - - run: script/install-emscripten.sh + run: script/install-emscripten.sh - name: Build emscripten - - run: npm run build:browser + run: npm run build:browser - name: Lint JavaScript - - run: npm run standard + run: npm run standard - name: Test Browser - - run: npm run test:browser + run: npm run test:browser - name: Test Node.js - - run: npm run test:node + run: npm run test:node - name: Test native - - run: npm run test:native + run: npm run test:native From 80248bc552204194fb65f40c9f546a2257d6fa0f Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Thu, 28 May 2020 02:47:39 -0500 Subject: [PATCH 17/22] use npm install --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1143bbd8..eb165d32 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ jobs: run: git submodule update --init - name: Install node dependencies - run: npm ci + run: npm install - name: Build with emscripten run: script/install-emscripten.sh From c0122a36e697e53552b2685c30b8c7ee755352e5 Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Thu, 28 May 2020 02:52:37 -0500 Subject: [PATCH 18/22] try using old sdk --- script/install-emscripten.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/script/install-emscripten.sh b/script/install-emscripten.sh index 81951f50..d352028d 100755 --- a/script/install-emscripten.sh +++ b/script/install-emscripten.sh @@ -17,6 +17,6 @@ echo 'Installing emscripten SDK...' #sed -i{} "s_/WebAssembly/binaryen/'_/WebAssembly/binaryen'_" $EMSDK_PATH $EMSDK_PATH update -$EMSDK_PATH list -$EMSDK_PATH install sdk-1.38.48-64bit -$EMSDK_PATH activate sdk-1.38.48-64bit +$EMSDK_PATH list --old +$EMSDK_PATH install sdk-1.37.9-64bit +$EMSDK_PATH activate sdk-1.37.9-64bit \ No newline at end of file From 4a2b252da3eed3d3c41fb6e07e57dca8cdc2a6c4 Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Thu, 28 May 2020 02:59:02 -0500 Subject: [PATCH 19/22] Use latest-sdk@1.39.16 --- script/install-emscripten.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/script/install-emscripten.sh b/script/install-emscripten.sh index d352028d..b4d92473 100755 --- a/script/install-emscripten.sh +++ b/script/install-emscripten.sh @@ -2,8 +2,8 @@ set -e -EMSCRIPTEN_DOWNLOAD_URL='https://codeload.github.com/emscripten-core/emsdk/tar.gz/1.38.48' -EMSDK_PATH="./emsdk-1.38.48/emsdk" +EMSCRIPTEN_DOWNLOAD_URL='https://codeload.github.com/emscripten-core/emsdk/tar.gz/1.39.16' +EMSDK_PATH="./emsdk-1.39.16/emsdk" if [ ! -f $EMSDK_PATH ]; then echo 'Downloading emscripten SDK installer...' @@ -17,6 +17,6 @@ echo 'Installing emscripten SDK...' #sed -i{} "s_/WebAssembly/binaryen/'_/WebAssembly/binaryen'_" $EMSDK_PATH $EMSDK_PATH update -$EMSDK_PATH list --old -$EMSDK_PATH install sdk-1.37.9-64bit -$EMSDK_PATH activate sdk-1.37.9-64bit \ No newline at end of file +$EMSDK_PATH list +$EMSDK_PATH install sdk-1.39.16-64bit +$EMSDK_PATH activate sdk-1.39.16-64bit From 9c88f1a35be36d3a624495cd4f7805b12b86e044 Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Thu, 28 May 2020 03:08:09 -0500 Subject: [PATCH 20/22] Correct sdk path --- script/build-browser-version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/build-browser-version.sh b/script/build-browser-version.sh index 76e42097..64f3011a 100755 --- a/script/build-browser-version.sh +++ b/script/build-browser-version.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -source emsdk-1.38.48/emsdk_env.sh +source emsdk-1.39.16/emsdk_env.sh mkdir -p build From f2fd27955cceb040eeef5b8c1411fde86380a654 Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Fri, 29 May 2020 17:12:57 -0500 Subject: [PATCH 21/22] Compile using legacy version emscripten instead of sdk --- .gitignore | 3 ++- script/install-emscripten.sh | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 51f142db..6887cce9 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,6 @@ build .clang_complete /browser.js -emsdk-portable +emsdk-1.39.16 package-lock.json +browser.wasm \ No newline at end of file diff --git a/script/install-emscripten.sh b/script/install-emscripten.sh index b4d92473..609ceefa 100755 --- a/script/install-emscripten.sh +++ b/script/install-emscripten.sh @@ -18,5 +18,5 @@ echo 'Installing emscripten SDK...' $EMSDK_PATH update $EMSDK_PATH list -$EMSDK_PATH install sdk-1.39.16-64bit -$EMSDK_PATH activate sdk-1.39.16-64bit +$EMSDK_PATH install emscripten-1.37.9 +$EMSDK_PATH activate emscripten-1.37.9 From 24439c7f2f646ff54fe2299063f6665c9427c2fc Mon Sep 17 00:00:00 2001 From: Mazen El-Kashef Date: Fri, 29 May 2020 17:16:47 -0500 Subject: [PATCH 22/22] show old --- script/install-emscripten.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/install-emscripten.sh b/script/install-emscripten.sh index 609ceefa..d22ab23c 100755 --- a/script/install-emscripten.sh +++ b/script/install-emscripten.sh @@ -17,6 +17,6 @@ echo 'Installing emscripten SDK...' #sed -i{} "s_/WebAssembly/binaryen/'_/WebAssembly/binaryen'_" $EMSDK_PATH $EMSDK_PATH update -$EMSDK_PATH list +$EMSDK_PATH list --old $EMSDK_PATH install emscripten-1.37.9 $EMSDK_PATH activate emscripten-1.37.9