From 470bc1ecb0e5b5b5169a4a48b5a412cf13aee1e6 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Wed, 7 Feb 2024 12:36:41 +0530 Subject: [PATCH 01/54] Updated config to work on windows & macos --- .circleci/config.yml | 137 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 133 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f00dab617..34210bd50 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,9 +4,10 @@ orbs: node: circleci/node@5.2.0 go: circleci/go@1.10.0 rust: circleci/rust@1.6.1 + win: circleci/windows@2.2.0 jobs: - build: + build-linux: docker: - image: coasys/ad4m-ci-linux:latest@sha256:7008f587d355d1adeb58553f52f99e1812822b4d21dc78d69bc96040d5e57e82 resource_class: xlarge @@ -29,7 +30,131 @@ jobs: cd crates/hc cargo build --release pwd - ls -la + ls -la + mkdir -p $HOME/.cargo/bin + cd ../../target/release + pwd + ls -lah + cp hc $HOME/.cargo/bin/hc + cd $HOME/.cargo/bin + pwd + ls -lah + ./hc --version + fi + echo 'export PATH="$HOME/.cargo/bin:$PATH"' >> $BASH_ENV + - save_cache: + key: hc-0.3.0-beta-dev-27-v7 + paths: + - /home/circleci/.cargo/bin + - restore_cache: + keys: + - rust-cache-{{ checksum "Cargo.lock" }}-v2 + - rust-cache- + - run: + name: Install dependencies + command: pnpm install --no-frozen-lockfile + - run: + name: Install core dependencies + command: cd ./core && pnpm install --no-frozen-lockfile + - run: + name: Build ADAM (without bootstrap languages) + command: pnpm run build-libs + - save_cache: + key: rust-cache-{{ checksum "Cargo.lock" }}-v2 + paths: + - ./target + - ~/.cargo/registry + - ~/.cargo/git + - persist_to_workspace: + no-output-timeout: 30m + root: . + paths: + - . + + build-windows: + executor: + name: win/default + size: xlarge + steps: + - checkout + - restore_cache: + keys: + - hc-0.3.0-beta-dev-27-v7 + - hc- + - rust-cache-{{ checksum "Cargo.lock" }} + - rust-cache- + - run: + name: Install HC + command: | + ls -la $HOME/.cargo/bin + if (!(Test-Path "$HOME/.cargo/bin/hc")) { + git clone https://github.com/holochain/holochain.git + cd holochain + git checkout holochain-0.3.0-beta-dev.27 + cd crates/hc + cargo build --release + pwd + ls -la + New-Item -ItemType Directory -Force -Path $HOME/.cargo/bin + cd ../../target/release + pwd + ls -lah + Copy-Item -Path hc -Destination $HOME/.cargo/bin/hc + cd $HOME/.cargo/bin + pwd + ls -lah + ./hc --version + } + $env:PATH = "$HOME/.cargo/bin;" + $env:PATH + - save_cache: + key: hc-0.3.0-beta-dev-27-v7 + paths: + - /home/circleci/.cargo/bin + - restore_cache: + keys: + - rust-cache-{{ checksum "Cargo.lock" }}-v2 + - rust-cache- + - run: + name: Install Rust + command: rustup-init.exe -y --default-host x86_64-pc-windows-msvc --default-toolchain stable + - run: + name: Install dependencies + command: pnpm install --no-frozen-lockfile + - run: + name: Install core dependencies + command: cd ./core && pnpm install --no-frozen-lockfile + - run: + name: Build ADAM (without bootstrap languages) + command: pnpm run build-libs + - persist_to_workspace: + no-output-timeout: 30m + root: . + paths: + - . + + build-macos: + macos: + xcode: "12.5.1" + steps: + - checkout + - restore_cache: + keys: + - hc-0.3.0-beta-dev-27-v7 + - hc- + - rust-cache-{{ checksum "Cargo.lock" }} + - rust-cache- + - run: + name: Install HC + command: | + ls -la $HOME/.cargo/bin + if [ ! -f "$HOME/.cargo/bin/hc" ]; then + git clone https://github.com/holochain/holochain.git + cd holochain + git checkout holochain-0.3.0-beta-dev.27 + cd crates/hc + cargo build --release + pwd + ls -la mkdir -p $HOME/.cargo/bin cd ../../target/release pwd @@ -164,10 +289,14 @@ workflows: version: 2 build-and-test: jobs: - - build + - build-linux + - build-windows + - build-macos - unit-tests: requires: - build - integration-tests-js: requires: - - build + - build-linux + - build-windows + - build-macos From 5a6966dc651db97f34afe385778e1389cc0b74a0 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Wed, 7 Feb 2024 12:38:42 +0530 Subject: [PATCH 02/54] fixed build name --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 34210bd50..225f5d26c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -294,7 +294,7 @@ workflows: - build-macos - unit-tests: requires: - - build + - build-linux - integration-tests-js: requires: - build-linux From 5a42c7d28121c82e10e26faa2766f86e88608d2b Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Wed, 7 Feb 2024 12:46:58 +0530 Subject: [PATCH 03/54] Updated config --- .circleci/config.yml | 135 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 133 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 225f5d26c..26cb9b56b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -205,7 +205,7 @@ jobs: name: Root tests command: pnpm test - integration-tests-js: + integration-tests-js-linux: docker: - image: coasys/ad4m-ci-linux:latest@sha256:7008f587d355d1adeb58553f52f99e1812822b4d21dc78d69bc96040d5e57e82 resource_class: xlarge @@ -269,6 +269,133 @@ jobs: name: Run integration tests command: cd ./tests/js && pnpm run test-main + integration-tests-js-windows: + executor: + name: win/default + size: xlarge + steps: + - attach_workspace: + at: . + - restore_cache: + keys: + - hc-0.3.0-beta-dev-27-v7 + - hc- + - restore_cache: + keys: + - agent-language-rust-cache-{{ checksum "bootstrap-languages/agent-language/hc-dna/Cargo.lock" }} + - agent-language-rust-cache- + - restore_cache: + keys: + - direct-message-language-rust-cache-{{ checksum "bootstrap-languages/direct-message-language/hc-dna/Cargo.lock" }} + - direct-message-language-rust-cache- + - restore_cache: + keys: + - file-storage-rust-cache-{{ checksum "bootstrap-languages/file-storage/hc-dna/Cargo.lock" }} + - file-storage-rust-cache- + - restore_cache: + keys: + - p-diff-sync-rust-cache-{{ checksum "bootstrap-languages/p-diff-sync/hc-dna/Cargo.lock" }} + - p-diff-sync-rust-cache- + - restore_cache: + keys: + - p-diff-sync-socket-signaling-rust-cache-{{ checksum "bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/Cargo.lock" }} + - p-diff-sync-socket-signaling-rust-cache- + - run: + name: Install dependencies + command: pnpm install --no-frozen-lockfile + - run: + name: Install core dependencies + command: cd ./core && pnpm install --no-frozen-lockfile + - run: + name: Build bootstrap languages + command: pnpm run build-languages + - save_cache: + key: agent-language-rust-cache-{{ checksum "bootstrap-languages/agent-language/hc-dna/Cargo.lock" }} + paths: + - ./bootstrap-languages/agent-language/hc-dna/target + - save_cache: + key: direct-message-language-rust-cache-{{ checksum "bootstrap-languages/direct-message-language/hc-dna/Cargo.lock" }} + paths: + - ./bootstrap-languages/direct-message-language/hc-dna/target + - save_cache: + key: file-storage-rust-cache-{{ checksum "bootstrap-languages/file-storage/hc-dna/Cargo.lock" }} + paths: + - ./bootstrap-languages/file-storage-language/hc-dna/target + - save_cache: + key: p-diff-sync-rust-cache-{{ checksum "bootstrap-languages/p-diff-sync/hc-dna/Cargo.lock" }} + paths: + - ./bootstrap-languages/p-diff-sync/hc-dna/target + - save_cache: + key: p-diff-sync-socket-signaling-rust-cache-{{ checksum "bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/Cargo.lock" }} + paths: + - ./bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/target + - run: + name: Run integration tests + command: cd ./tests/js && pnpm run test-main + + integration-tests-js-macos: + macos: + xcode: "12.5.1" + steps: + - attach_workspace: + at: . + - restore_cache: + keys: + - hc-0.3.0-beta-dev-27-v7 + - hc- + - restore_cache: + keys: + - agent-language-rust-cache-{{ checksum "bootstrap-languages/agent-language/hc-dna/Cargo.lock" }} + - agent-language-rust-cache- + - restore_cache: + keys: + - direct-message-language-rust-cache-{{ checksum "bootstrap-languages/direct-message-language/hc-dna/Cargo.lock" }} + - direct-message-language-rust-cache- + - restore_cache: + keys: + - file-storage-rust-cache-{{ checksum "bootstrap-languages/file-storage/hc-dna/Cargo.lock" }} + - file-storage-rust-cache- + - restore_cache: + keys: + - p-diff-sync-rust-cache-{{ checksum "bootstrap-languages/p-diff-sync/hc-dna/Cargo.lock" }} + - p-diff-sync-rust-cache- + - restore_cache: + keys: + - p-diff-sync-socket-signaling-rust-cache-{{ checksum "bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/Cargo.lock" }} + - p-diff-sync-socket-signaling-rust-cache- + - run: + name: Install dependencies + command: pnpm install --no-frozen-lockfile + - run: + name: Install core dependencies + command: cd ./core && pnpm install --no-frozen-lockfile + - run: + name: Build bootstrap languages + command: pnpm run build-languages + - save_cache: + key: agent-language-rust-cache-{{ checksum "bootstrap-languages/agent-language/hc-dna/Cargo.lock" }} + paths: + - ./bootstrap-languages/agent-language/hc-dna/target + - save_cache: + key: direct-message-language-rust-cache-{{ checksum "bootstrap-languages/direct-message-language/hc-dna/Cargo.lock" }} + paths: + - ./bootstrap-languages/direct-message-language/hc-dna/target + - save_cache: + key: file-storage-rust-cache-{{ checksum "bootstrap-languages/file-storage/hc-dna/Cargo.lock" }} + paths: + - ./bootstrap-languages/file-storage-language/hc-dna/target + - save_cache: + key: p-diff-sync-rust-cache-{{ checksum "bootstrap-languages/p-diff-sync/hc-dna/Cargo.lock" }} + paths: + - ./bootstrap-languages/p-diff-sync/hc-dna/target + - save_cache: + key: p-diff-sync-socket-signaling-rust-cache-{{ checksum "bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/Cargo.lock" }} + paths: + - ./bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/target + - run: + name: Run integration tests + command: cd ./tests/js && pnpm run test-main + integration-tests-cli: docker: - image: coasys/ad4m-ci-linux:latest@sha256:7008f587d355d1adeb58553f52f99e1812822b4d21dc78d69bc96040d5e57e82 @@ -295,8 +422,12 @@ workflows: - unit-tests: requires: - build-linux - - integration-tests-js: + - integration-tests-js-linux: requires: - build-linux + - integration-tests-js-windows: + requires: - build-windows + - integration-tests-js-macos: + requires: - build-macos From 1b10fc062db4a52790f6c7f562cfd1504a09933f Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Wed, 7 Feb 2024 12:55:12 +0530 Subject: [PATCH 04/54] Updated cofig for macos --- .circleci/config.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 26cb9b56b..4893f892e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,6 +5,7 @@ orbs: go: circleci/go@1.10.0 rust: circleci/rust@1.6.1 win: circleci/windows@2.2.0 + mac: circleci/macos@1.1.0 jobs: build-linux: @@ -137,6 +138,29 @@ jobs: xcode: "12.5.1" steps: - checkout + - node/install: + install-npm: false + version: '14' + - run: + name: Install Deno + command: | + curl -fsSL https://deno.land/x/install/install.sh | sh + echo 'export PATH="/Users/distiller/.deno/bin:$PATH"' >> $BASH_ENV + - run: + name: Install pnpm + command: npm install -g pnpm + - run: + name: Install Protobuf and CMake + command: brew install protobuf cmake + - run: + name: Verify installations + command: | + rustc --version + node --version + deno --version + pnpm --version + protoc --version + cmake --version - restore_cache: keys: - hc-0.3.0-beta-dev-27-v7 From 1873f98ea6197d67f835ae4dce8435a49418c396 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Wed, 7 Feb 2024 12:55:55 +0530 Subject: [PATCH 05/54] Update windows config --- .circleci/config.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4893f892e..4bfda37ba 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -78,6 +78,29 @@ jobs: size: xlarge steps: - checkout + - node/install: + install-npm: false + version: '14' + - run: + name: Install Deno + command: | + curl -fsSL https://deno.land/x/install/install.sh | sh + echo 'export PATH="/Users/distiller/.deno/bin:$PATH"' >> $BASH_ENV + - run: + name: Install pnpm + command: npm install -g pnpm + - run: + name: Install Protobuf and CMake + command: brew install protobuf cmake + - run: + name: Verify installations + command: | + rustc --version + node --version + deno --version + pnpm --version + protoc --version + cmake --version - restore_cache: keys: - hc-0.3.0-beta-dev-27-v7 From 5aa82df04c898015c0c512c18e1f17b0ed3a2d59 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Wed, 7 Feb 2024 12:58:23 +0530 Subject: [PATCH 06/54] Updated node version --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4bfda37ba..445dad99b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -80,7 +80,7 @@ jobs: - checkout - node/install: install-npm: false - version: '14' + version: '16.13' - run: name: Install Deno command: | @@ -163,7 +163,7 @@ jobs: - checkout - node/install: install-npm: false - version: '14' + version: '16.13' - run: name: Install Deno command: | From 91ba23b5adf60fa1a6d5e2c41c4332070a401c26 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Wed, 7 Feb 2024 12:59:04 +0530 Subject: [PATCH 07/54] fixed key --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 445dad99b..546b4c95d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -80,7 +80,7 @@ jobs: - checkout - node/install: install-npm: false - version: '16.13' + node-version: '16.13' - run: name: Install Deno command: | @@ -163,7 +163,7 @@ jobs: - checkout - node/install: install-npm: false - version: '16.13' + node-version: '16.13' - run: name: Install Deno command: | From d494b1985d480962a95b78ecaa592614be6a10a8 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Wed, 7 Feb 2024 12:59:34 +0530 Subject: [PATCH 08/54] removed install-npm key --- .circleci/config.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 546b4c95d..59afb08b1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -79,7 +79,6 @@ jobs: steps: - checkout - node/install: - install-npm: false node-version: '16.13' - run: name: Install Deno @@ -162,7 +161,6 @@ jobs: steps: - checkout - node/install: - install-npm: false node-version: '16.13' - run: name: Install Deno From 805c80e1bfb5697b0322fc941ca2f1c3c9dc3da6 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Wed, 7 Feb 2024 13:16:12 +0530 Subject: [PATCH 09/54] updated to latest macos version --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 59afb08b1..752f0029a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -157,7 +157,7 @@ jobs: build-macos: macos: - xcode: "12.5.1" + xcode: "15.2.0" steps: - checkout - node/install: From 9f142ed7137400de4328e572c6e3f128958d1117 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Wed, 7 Feb 2024 13:19:37 +0530 Subject: [PATCH 10/54] updated windows machine --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 752f0029a..a48b88027 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -73,9 +73,9 @@ jobs: - . build-windows: - executor: - name: win/default - size: xlarge + machine: + image: 'windows-server-2022-gui:current' + shell: 'powershell.exe -ExecutionPolicy Bypass' steps: - checkout - node/install: @@ -380,7 +380,7 @@ jobs: integration-tests-js-macos: macos: - xcode: "12.5.1" + xcode: "15.2.0" steps: - attach_workspace: at: . From 7049f17bfef58e2bd2f37068c2e66ac0729c3250 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Wed, 7 Feb 2024 13:24:46 +0530 Subject: [PATCH 11/54] revert back to old windows image --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a48b88027..69ad29197 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -73,9 +73,9 @@ jobs: - . build-windows: - machine: - image: 'windows-server-2022-gui:current' - shell: 'powershell.exe -ExecutionPolicy Bypass' + executor: + name: win/default + size: xlarge steps: - checkout - node/install: From 507d5afb7cd7f64adffcfbfdd78b26ae10d5a97a Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Wed, 7 Feb 2024 13:29:54 +0530 Subject: [PATCH 12/54] install rust --- .circleci/config.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 69ad29197..08718f908 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -162,6 +162,11 @@ jobs: - checkout - node/install: node-version: '16.13' + - run: + name: Install Rust + command: | + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh + echo 'export PATH="$HOME/.cargo/bin:$PATH"' >> $BASH_ENV - run: name: Install Deno command: | From 95ca45d85a9242e8e3a26861d8620ad2fb5415fe Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Wed, 7 Feb 2024 13:35:23 +0530 Subject: [PATCH 13/54] Fix Rust installation command --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 08718f908..dec2fb3c9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -165,7 +165,7 @@ jobs: - run: name: Install Rust command: | - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh + 1 | curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh echo 'export PATH="$HOME/.cargo/bin:$PATH"' >> $BASH_ENV - run: name: Install Deno From 6ee63468a2a51f75ce83905d33642655b5a62969 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Wed, 7 Feb 2024 13:36:34 +0530 Subject: [PATCH 14/54] Fix Rust installation command --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index dec2fb3c9..6aa9d0673 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -165,7 +165,7 @@ jobs: - run: name: Install Rust command: | - 1 | curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh + yes | curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh echo 'export PATH="$HOME/.cargo/bin:$PATH"' >> $BASH_ENV - run: name: Install Deno From 0c5dd9d22ad8c33a898f05888e97c43091259adf Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Wed, 7 Feb 2024 13:38:30 +0530 Subject: [PATCH 15/54] Update Rust installation command --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6aa9d0673..c9a40b8a0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -165,7 +165,7 @@ jobs: - run: name: Install Rust command: | - yes | curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y echo 'export PATH="$HOME/.cargo/bin:$PATH"' >> $BASH_ENV - run: name: Install Deno From eb55d9a4a125c01e3c1bb85beee028541f925276 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Wed, 7 Feb 2024 13:40:50 +0530 Subject: [PATCH 16/54] Update node version --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c9a40b8a0..edfd52ef0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -79,7 +79,7 @@ jobs: steps: - checkout - node/install: - node-version: '16.13' + node-version: '16.14' - run: name: Install Deno command: | @@ -161,7 +161,7 @@ jobs: steps: - checkout - node/install: - node-version: '16.13' + node-version: '16.14' - run: name: Install Rust command: | From d17950f64c82fb656883f1a816012e6905dc1baf Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Wed, 7 Feb 2024 13:47:17 +0530 Subject: [PATCH 17/54] Add installation steps for Go --- .circleci/config.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index edfd52ef0..8702424b3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -167,6 +167,12 @@ jobs: command: | curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y echo 'export PATH="$HOME/.cargo/bin:$PATH"' >> $BASH_ENV + - run: + name: Install Go + command: | + curl -O https://dl.google.com/go/go1.20.6.darwin-amd64.tar.gz + sudo tar -C /usr/local -xzf go1.20.6.darwin-amd64.tar.gz + echo 'export PATH="/usr/local/go/bin:$PATH"' >> $BASH_ENV - run: name: Install Deno command: | From 6e3589cafa0f4e56baf079aa5841c7d2cc4ec431 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Wed, 7 Feb 2024 14:29:27 +0530 Subject: [PATCH 18/54] removed restore-cache --- .circleci/config.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8702424b3..823a6ed4e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -226,10 +226,6 @@ jobs: key: hc-0.3.0-beta-dev-27-v7 paths: - /home/circleci/.cargo/bin - - restore_cache: - keys: - - rust-cache-{{ checksum "Cargo.lock" }}-v2 - - rust-cache- - run: name: Install dependencies command: pnpm install --no-frozen-lockfile From b5a589e34bcead917255a7299b36049b8a75942a Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Thu, 8 Feb 2024 10:55:31 +0530 Subject: [PATCH 19/54] Update config --- .circleci/config.yml | 319 +++++++++++++------------------------------ 1 file changed, 94 insertions(+), 225 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 823a6ed4e..77db4a769 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ orbs: mac: circleci/macos@1.1.0 jobs: - build-linux: + build: docker: - image: coasys/ad4m-ci-linux:latest@sha256:7008f587d355d1adeb58553f52f99e1812822b4d21dc78d69bc96040d5e57e82 resource_class: xlarge @@ -72,7 +72,81 @@ jobs: paths: - . - build-windows: + unit-tests: + docker: + - image: coasys/ad4m-ci-linux:latest@sha256:7008f587d355d1adeb58553f52f99e1812822b4d21dc78d69bc96040d5e57e82 + steps: + - attach_workspace: + at: . + - run: + name: Root tests + command: pnpm test + + integration-tests-js-linux: + docker: + - image: coasys/ad4m-ci-linux:latest@sha256:7008f587d355d1adeb58553f52f99e1812822b4d21dc78d69bc96040d5e57e82 + resource_class: xlarge + steps: + - attach_workspace: + at: . + - restore_cache: + keys: + - hc-0.3.0-beta-dev-27-v7 + - hc- + - restore_cache: + keys: + - agent-language-rust-cache-{{ checksum "bootstrap-languages/agent-language/hc-dna/Cargo.lock" }} + - agent-language-rust-cache- + - restore_cache: + keys: + - direct-message-language-rust-cache-{{ checksum "bootstrap-languages/direct-message-language/hc-dna/Cargo.lock" }} + - direct-message-language-rust-cache- + - restore_cache: + keys: + - file-storage-rust-cache-{{ checksum "bootstrap-languages/file-storage/hc-dna/Cargo.lock" }} + - file-storage-rust-cache- + - restore_cache: + keys: + - p-diff-sync-rust-cache-{{ checksum "bootstrap-languages/p-diff-sync/hc-dna/Cargo.lock" }} + - p-diff-sync-rust-cache- + - restore_cache: + keys: + - p-diff-sync-socket-signaling-rust-cache-{{ checksum "bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/Cargo.lock" }} + - p-diff-sync-socket-signaling-rust-cache- + - run: + name: Install dependencies + command: pnpm install --no-frozen-lockfile + - run: + name: Install core dependencies + command: cd ./core && pnpm install --no-frozen-lockfile + - run: + name: Build bootstrap languages + command: pnpm run build-languages + - save_cache: + key: agent-language-rust-cache-{{ checksum "bootstrap-languages/agent-language/hc-dna/Cargo.lock" }} + paths: + - ./bootstrap-languages/agent-language/hc-dna/target + - save_cache: + key: direct-message-language-rust-cache-{{ checksum "bootstrap-languages/direct-message-language/hc-dna/Cargo.lock" }} + paths: + - ./bootstrap-languages/direct-message-language/hc-dna/target + - save_cache: + key: file-storage-rust-cache-{{ checksum "bootstrap-languages/file-storage/hc-dna/Cargo.lock" }} + paths: + - ./bootstrap-languages/file-storage-language/hc-dna/target + - save_cache: + key: p-diff-sync-rust-cache-{{ checksum "bootstrap-languages/p-diff-sync/hc-dna/Cargo.lock" }} + paths: + - ./bootstrap-languages/p-diff-sync/hc-dna/target + - save_cache: + key: p-diff-sync-socket-signaling-rust-cache-{{ checksum "bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/Cargo.lock" }} + paths: + - ./bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/target + - run: + name: Run integration tests + command: cd ./tests/js && pnpm run test-main + + integration-tests-js-windows: executor: name: win/default size: xlarge @@ -100,12 +174,6 @@ jobs: pnpm --version protoc --version cmake --version - - restore_cache: - keys: - - hc-0.3.0-beta-dev-27-v7 - - hc- - - rust-cache-{{ checksum "Cargo.lock" }} - - rust-cache- - run: name: Install HC command: | @@ -133,10 +201,6 @@ jobs: key: hc-0.3.0-beta-dev-27-v7 paths: - /home/circleci/.cargo/bin - - restore_cache: - keys: - - rust-cache-{{ checksum "Cargo.lock" }}-v2 - - rust-cache- - run: name: Install Rust command: rustup-init.exe -y --default-host x86_64-pc-windows-msvc --default-toolchain stable @@ -149,13 +213,20 @@ jobs: - run: name: Build ADAM (without bootstrap languages) command: pnpm run build-libs - - persist_to_workspace: - no-output-timeout: 30m - root: . - paths: - - . + - run: + name: Install dependencies + command: pnpm install --no-frozen-lockfile + - run: + name: Install core dependencies + command: cd ./core && pnpm install --no-frozen-lockfile + - run: + name: Build bootstrap languages + command: pnpm run build-languages + - run: + name: Run integration tests + command: cd ./tests/js && pnpm run test-main - build-macos: + integration-tests-js-macos: macos: xcode: "15.2.0" steps: @@ -241,209 +312,9 @@ jobs: - ./target - ~/.cargo/registry - ~/.cargo/git - - persist_to_workspace: - no-output-timeout: 30m - root: . - paths: - - . - - unit-tests: - docker: - - image: coasys/ad4m-ci-linux:latest@sha256:7008f587d355d1adeb58553f52f99e1812822b4d21dc78d69bc96040d5e57e82 - steps: - - attach_workspace: - at: . - - run: - name: Root tests - command: pnpm test - - integration-tests-js-linux: - docker: - - image: coasys/ad4m-ci-linux:latest@sha256:7008f587d355d1adeb58553f52f99e1812822b4d21dc78d69bc96040d5e57e82 - resource_class: xlarge - steps: - - attach_workspace: - at: . - - restore_cache: - keys: - - hc-0.3.0-beta-dev-27-v7 - - hc- - - restore_cache: - keys: - - agent-language-rust-cache-{{ checksum "bootstrap-languages/agent-language/hc-dna/Cargo.lock" }} - - agent-language-rust-cache- - - restore_cache: - keys: - - direct-message-language-rust-cache-{{ checksum "bootstrap-languages/direct-message-language/hc-dna/Cargo.lock" }} - - direct-message-language-rust-cache- - - restore_cache: - keys: - - file-storage-rust-cache-{{ checksum "bootstrap-languages/file-storage/hc-dna/Cargo.lock" }} - - file-storage-rust-cache- - - restore_cache: - keys: - - p-diff-sync-rust-cache-{{ checksum "bootstrap-languages/p-diff-sync/hc-dna/Cargo.lock" }} - - p-diff-sync-rust-cache- - - restore_cache: - keys: - - p-diff-sync-socket-signaling-rust-cache-{{ checksum "bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/Cargo.lock" }} - - p-diff-sync-socket-signaling-rust-cache- - - run: - name: Install dependencies - command: pnpm install --no-frozen-lockfile - - run: - name: Install core dependencies - command: cd ./core && pnpm install --no-frozen-lockfile - - run: - name: Build bootstrap languages - command: pnpm run build-languages - - save_cache: - key: agent-language-rust-cache-{{ checksum "bootstrap-languages/agent-language/hc-dna/Cargo.lock" }} - paths: - - ./bootstrap-languages/agent-language/hc-dna/target - - save_cache: - key: direct-message-language-rust-cache-{{ checksum "bootstrap-languages/direct-message-language/hc-dna/Cargo.lock" }} - paths: - - ./bootstrap-languages/direct-message-language/hc-dna/target - - save_cache: - key: file-storage-rust-cache-{{ checksum "bootstrap-languages/file-storage/hc-dna/Cargo.lock" }} - paths: - - ./bootstrap-languages/file-storage-language/hc-dna/target - - save_cache: - key: p-diff-sync-rust-cache-{{ checksum "bootstrap-languages/p-diff-sync/hc-dna/Cargo.lock" }} - paths: - - ./bootstrap-languages/p-diff-sync/hc-dna/target - - save_cache: - key: p-diff-sync-socket-signaling-rust-cache-{{ checksum "bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/Cargo.lock" }} - paths: - - ./bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/target - - run: - name: Run integration tests - command: cd ./tests/js && pnpm run test-main - - integration-tests-js-windows: - executor: - name: win/default - size: xlarge - steps: - - attach_workspace: - at: . - - restore_cache: - keys: - - hc-0.3.0-beta-dev-27-v7 - - hc- - - restore_cache: - keys: - - agent-language-rust-cache-{{ checksum "bootstrap-languages/agent-language/hc-dna/Cargo.lock" }} - - agent-language-rust-cache- - - restore_cache: - keys: - - direct-message-language-rust-cache-{{ checksum "bootstrap-languages/direct-message-language/hc-dna/Cargo.lock" }} - - direct-message-language-rust-cache- - - restore_cache: - keys: - - file-storage-rust-cache-{{ checksum "bootstrap-languages/file-storage/hc-dna/Cargo.lock" }} - - file-storage-rust-cache- - - restore_cache: - keys: - - p-diff-sync-rust-cache-{{ checksum "bootstrap-languages/p-diff-sync/hc-dna/Cargo.lock" }} - - p-diff-sync-rust-cache- - - restore_cache: - keys: - - p-diff-sync-socket-signaling-rust-cache-{{ checksum "bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/Cargo.lock" }} - - p-diff-sync-socket-signaling-rust-cache- - - run: - name: Install dependencies - command: pnpm install --no-frozen-lockfile - - run: - name: Install core dependencies - command: cd ./core && pnpm install --no-frozen-lockfile - run: name: Build bootstrap languages command: pnpm run build-languages - - save_cache: - key: agent-language-rust-cache-{{ checksum "bootstrap-languages/agent-language/hc-dna/Cargo.lock" }} - paths: - - ./bootstrap-languages/agent-language/hc-dna/target - - save_cache: - key: direct-message-language-rust-cache-{{ checksum "bootstrap-languages/direct-message-language/hc-dna/Cargo.lock" }} - paths: - - ./bootstrap-languages/direct-message-language/hc-dna/target - - save_cache: - key: file-storage-rust-cache-{{ checksum "bootstrap-languages/file-storage/hc-dna/Cargo.lock" }} - paths: - - ./bootstrap-languages/file-storage-language/hc-dna/target - - save_cache: - key: p-diff-sync-rust-cache-{{ checksum "bootstrap-languages/p-diff-sync/hc-dna/Cargo.lock" }} - paths: - - ./bootstrap-languages/p-diff-sync/hc-dna/target - - save_cache: - key: p-diff-sync-socket-signaling-rust-cache-{{ checksum "bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/Cargo.lock" }} - paths: - - ./bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/target - - run: - name: Run integration tests - command: cd ./tests/js && pnpm run test-main - - integration-tests-js-macos: - macos: - xcode: "15.2.0" - steps: - - attach_workspace: - at: . - - restore_cache: - keys: - - hc-0.3.0-beta-dev-27-v7 - - hc- - - restore_cache: - keys: - - agent-language-rust-cache-{{ checksum "bootstrap-languages/agent-language/hc-dna/Cargo.lock" }} - - agent-language-rust-cache- - - restore_cache: - keys: - - direct-message-language-rust-cache-{{ checksum "bootstrap-languages/direct-message-language/hc-dna/Cargo.lock" }} - - direct-message-language-rust-cache- - - restore_cache: - keys: - - file-storage-rust-cache-{{ checksum "bootstrap-languages/file-storage/hc-dna/Cargo.lock" }} - - file-storage-rust-cache- - - restore_cache: - keys: - - p-diff-sync-rust-cache-{{ checksum "bootstrap-languages/p-diff-sync/hc-dna/Cargo.lock" }} - - p-diff-sync-rust-cache- - - restore_cache: - keys: - - p-diff-sync-socket-signaling-rust-cache-{{ checksum "bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/Cargo.lock" }} - - p-diff-sync-socket-signaling-rust-cache- - - run: - name: Install dependencies - command: pnpm install --no-frozen-lockfile - - run: - name: Install core dependencies - command: cd ./core && pnpm install --no-frozen-lockfile - - run: - name: Build bootstrap languages - command: pnpm run build-languages - - save_cache: - key: agent-language-rust-cache-{{ checksum "bootstrap-languages/agent-language/hc-dna/Cargo.lock" }} - paths: - - ./bootstrap-languages/agent-language/hc-dna/target - - save_cache: - key: direct-message-language-rust-cache-{{ checksum "bootstrap-languages/direct-message-language/hc-dna/Cargo.lock" }} - paths: - - ./bootstrap-languages/direct-message-language/hc-dna/target - - save_cache: - key: file-storage-rust-cache-{{ checksum "bootstrap-languages/file-storage/hc-dna/Cargo.lock" }} - paths: - - ./bootstrap-languages/file-storage-language/hc-dna/target - - save_cache: - key: p-diff-sync-rust-cache-{{ checksum "bootstrap-languages/p-diff-sync/hc-dna/Cargo.lock" }} - paths: - - ./bootstrap-languages/p-diff-sync/hc-dna/target - - save_cache: - key: p-diff-sync-socket-signaling-rust-cache-{{ checksum "bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/Cargo.lock" }} - paths: - - ./bootstrap-languages/p-diff-sync-socket-signaling/hc-dna/target - run: name: Run integration tests command: cd ./tests/js && pnpm run test-main @@ -468,18 +339,16 @@ workflows: version: 2 build-and-test: jobs: - - build-linux - - build-windows - - build-macos + - build - unit-tests: requires: - - build-linux + - build - integration-tests-js-linux: requires: - - build-linux + - build - integration-tests-js-windows: requires: - - build-windows + - build - integration-tests-js-macos: requires: - - build-macos + - build From ebc0cafcb3066cca5d0bb9d44f7c7d92a5fbd06e Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Thu, 8 Feb 2024 11:14:30 +0530 Subject: [PATCH 20/54] Added windows custom ssh key --- .circleci/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 77db4a769..e92756595 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -151,6 +151,9 @@ jobs: name: win/default size: xlarge steps: + - add_ssh_keys: + fingerprints: + - "SHA256:pSp0IbmprP+NHD1iG2+k2xUeJOG1yTzEnfqRLnUCk3c" - checkout - node/install: node-version: '16.14' From 0ca8baa5050c047ef85bad5fff99d0e5e7fae7de Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Thu, 8 Feb 2024 11:15:31 +0530 Subject: [PATCH 21/54] Removed build dependecies for macos & windows job --- .circleci/config.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e92756595..5b9beb677 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -349,9 +349,5 @@ workflows: - integration-tests-js-linux: requires: - build - - integration-tests-js-windows: - requires: - - build - - integration-tests-js-macos: - requires: - - build + - integration-tests-js-windows + - integration-tests-js-macos \ No newline at end of file From 3646b0d0903f20c3aa5ed3d6d4d4e9b505fcb9f7 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Thu, 8 Feb 2024 11:21:09 +0530 Subject: [PATCH 22/54] Update Node.js installation method --- .circleci/config.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5b9beb677..b1bd62aa8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -155,8 +155,9 @@ jobs: fingerprints: - "SHA256:pSp0IbmprP+NHD1iG2+k2xUeJOG1yTzEnfqRLnUCk3c" - checkout - - node/install: - node-version: '16.14' + - run: + name: Install Node.js + command: choco install nodejs - run: name: Install Deno command: | From dd70851bbdaf38e7b05992a3ae92c7fdd3dff8bc Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Thu, 8 Feb 2024 11:25:26 +0530 Subject: [PATCH 23/54] Update CircleCI configuration to install dependencies using choco and curl --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b1bd62aa8..601891150 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -165,10 +165,10 @@ jobs: echo 'export PATH="/Users/distiller/.deno/bin:$PATH"' >> $BASH_ENV - run: name: Install pnpm - command: npm install -g pnpm + command: curl -fsSL https://get.pnpm.io/install.sh | sh - - run: - name: Install Protobuf and CMake - command: brew install protobuf cmake + name: install dependencies + command: choco install protoc cmake curl cygwin gnuwin32-m4 msys2 make mingw - run: name: Verify installations command: | From da5469ef718b424145eb4abb2c30ffe990299d13 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Thu, 8 Feb 2024 11:29:51 +0530 Subject: [PATCH 24/54] Update CircleCI configuration to use Chocolatey for installing Deno and pnpm --- .circleci/config.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 601891150..943e00f68 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -160,12 +160,10 @@ jobs: command: choco install nodejs - run: name: Install Deno - command: | - curl -fsSL https://deno.land/x/install/install.sh | sh - echo 'export PATH="/Users/distiller/.deno/bin:$PATH"' >> $BASH_ENV + command: choco install deno - run: name: Install pnpm - command: curl -fsSL https://get.pnpm.io/install.sh | sh - + command: choco install pnpm - run: name: install dependencies command: choco install protoc cmake curl cygwin gnuwin32-m4 msys2 make mingw From 19b500fcdfc00bdb16be20da30b44cf110ce422b Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Thu, 8 Feb 2024 11:42:26 +0530 Subject: [PATCH 25/54] Add installation of Rust via Chocolatey --- .circleci/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 943e00f68..2986600ec 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -161,6 +161,9 @@ jobs: - run: name: Install Deno command: choco install deno + - run: + name: Install Rust + command: choco install rust - run: name: Install pnpm command: choco install pnpm From 229b94588f19724b5b00a8455ede5ac2d57b4980 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Thu, 8 Feb 2024 11:58:55 +0530 Subject: [PATCH 26/54] Add cmake installation step to CircleCI config --- .circleci/config.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2986600ec..6aa5c0f15 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -167,12 +167,16 @@ jobs: - run: name: Install pnpm command: choco install pnpm + - run: + name: Install cmake + command: choco install cmake - run: name: install dependencies - command: choco install protoc cmake curl cygwin gnuwin32-m4 msys2 make mingw + command: choco install protoc curl cygwin gnuwin32-m4 msys2 make mingw - run: name: Verify installations command: | + refreshenv rustc --version node --version deno --version From c03a0ce88e61561e7f9887323b7d1ca62c44f2e1 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Thu, 8 Feb 2024 12:11:49 +0530 Subject: [PATCH 27/54] Update cmake installation command to add cmake to PATH --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6aa5c0f15..08f4df7f2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -169,7 +169,7 @@ jobs: command: choco install pnpm - run: name: Install cmake - command: choco install cmake + command: choco install cmake --installargs 'ADD_CMAKE_TO_PATH=User' - run: name: install dependencies command: choco install protoc curl cygwin gnuwin32-m4 msys2 make mingw From 5ea576410809ece5986324d130626a7df6a7ed08 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Thu, 8 Feb 2024 12:35:52 +0530 Subject: [PATCH 28/54] Remove Rust installation step from CircleCI config --- .circleci/config.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 08f4df7f2..00a81071b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -210,9 +210,6 @@ jobs: key: hc-0.3.0-beta-dev-27-v7 paths: - /home/circleci/.cargo/bin - - run: - name: Install Rust - command: rustup-init.exe -y --default-host x86_64-pc-windows-msvc --default-toolchain stable - run: name: Install dependencies command: pnpm install --no-frozen-lockfile From ac661de7d3061a60de964a419224de4d6faa1fa4 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Thu, 8 Feb 2024 12:52:29 +0530 Subject: [PATCH 29/54] Update CircleCI configuration to include Python installation --- .circleci/config.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 00a81071b..d1f3559f6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -172,7 +172,7 @@ jobs: command: choco install cmake --installargs 'ADD_CMAKE_TO_PATH=User' - run: name: install dependencies - command: choco install protoc curl cygwin gnuwin32-m4 msys2 make mingw + command: choco install protoc curl cygwin gnuwin32-m4 msys2 make mingw python - run: name: Verify installations command: | @@ -212,19 +212,13 @@ jobs: - /home/circleci/.cargo/bin - run: name: Install dependencies - command: pnpm install --no-frozen-lockfile + command: pnpm install - run: name: Install core dependencies - command: cd ./core && pnpm install --no-frozen-lockfile + command: cd ./core && pnpm install - run: name: Build ADAM (without bootstrap languages) command: pnpm run build-libs - - run: - name: Install dependencies - command: pnpm install --no-frozen-lockfile - - run: - name: Install core dependencies - command: cd ./core && pnpm install --no-frozen-lockfile - run: name: Build bootstrap languages command: pnpm run build-languages From 088a284647870e235ae1deb3fd7648dffc604317 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Thu, 8 Feb 2024 13:10:19 +0530 Subject: [PATCH 30/54] Add python version check to build script --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index d1f3559f6..3e3dbc3a2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -264,6 +264,7 @@ jobs: pnpm --version protoc --version cmake --version + python --version - restore_cache: keys: - hc-0.3.0-beta-dev-27-v7 From 1101eb5dec5a2ff465e550ad1c0da62439cf1d38 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Thu, 8 Feb 2024 13:20:54 +0530 Subject: [PATCH 31/54] Add Python version check to build process --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3e3dbc3a2..b6e92ca6e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -183,6 +183,7 @@ jobs: pnpm --version protoc --version cmake --version + python --version - run: name: Install HC command: | From 65e6f902f92d8ce349030dde1baee4370a256b35 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Thu, 8 Feb 2024 13:21:16 +0530 Subject: [PATCH 32/54] Commented out unused jobs in CircleCI config --- .circleci/config.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b6e92ca6e..9998844ad 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -341,12 +341,12 @@ workflows: version: 2 build-and-test: jobs: - - build - - unit-tests: - requires: - - build - - integration-tests-js-linux: - requires: - - build + # - build + # - unit-tests: + # requires: + # - build + # - integration-tests-js-linux: + # requires: + # - build - integration-tests-js-windows - - integration-tests-js-macos \ No newline at end of file + # - integration-tests-js-macos \ No newline at end of file From b08aa56d6de7a75a55e26c94471a26effa390e38 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Thu, 8 Feb 2024 14:04:15 +0530 Subject: [PATCH 33/54] Add node-gyp installation step --- .circleci/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9998844ad..d17c8dca6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -173,6 +173,9 @@ jobs: - run: name: install dependencies command: choco install protoc curl cygwin gnuwin32-m4 msys2 make mingw python + - run: + name: Install node-gyp + command: npm install -g node-gyp - run: name: Verify installations command: | From 0e6b85a68fe0a579c554d36b5d430708932d6e2f Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Thu, 8 Feb 2024 14:13:11 +0530 Subject: [PATCH 34/54] Update Node.js version in CircleCI config --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d17c8dca6..f59c86da7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -157,7 +157,7 @@ jobs: - checkout - run: name: Install Node.js - command: choco install nodejs + command: choco install nodejs --version=18.17.0 - run: name: Install Deno command: choco install deno From 25056013f84ff1b2000b9ce6d878e5c59ae566ef Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Thu, 8 Feb 2024 14:22:25 +0530 Subject: [PATCH 35/54] Remove installation of node-gyp --- .circleci/config.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f59c86da7..ff7f398f1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -173,9 +173,6 @@ jobs: - run: name: install dependencies command: choco install protoc curl cygwin gnuwin32-m4 msys2 make mingw python - - run: - name: Install node-gyp - command: npm install -g node-gyp - run: name: Verify installations command: | From b69dc649a406fde99138000fa39493d875d1b3ff Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Thu, 8 Feb 2024 14:40:15 +0530 Subject: [PATCH 36/54] Update dependencies in CircleCI config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ff7f398f1..6004bb4a3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -172,7 +172,7 @@ jobs: command: choco install cmake --installargs 'ADD_CMAKE_TO_PATH=User' - run: name: install dependencies - command: choco install protoc curl cygwin gnuwin32-m4 msys2 make mingw python + command: choco install protoc curl cygwin gnuwin32-m4 msys2 make mingw python python2 visualstudio2019community - run: name: Verify installations command: | From 202b007b5fa299033fbd844541ae43e49d113629 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Thu, 8 Feb 2024 14:54:49 +0530 Subject: [PATCH 37/54] Add npm config and install dependencies --- .circleci/config.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6004bb4a3..143235682 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -184,6 +184,17 @@ jobs: protoc --version cmake --version python --version + - run: + name: Set npm config + command: | + npm config set python python2.7 + npm config set msvs_version 2019 + - run: + name: Install dependencies + command: pnpm install + - run: + name: Install core dependencies + command: cd ./core && pnpm install - run: name: Install HC command: | @@ -211,12 +222,6 @@ jobs: key: hc-0.3.0-beta-dev-27-v7 paths: - /home/circleci/.cargo/bin - - run: - name: Install dependencies - command: pnpm install - - run: - name: Install core dependencies - command: cd ./core && pnpm install - run: name: Build ADAM (without bootstrap languages) command: pnpm run build-libs From 9b2253d30120098193d2982fa99fc85fd44b1d09 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Thu, 8 Feb 2024 15:05:01 +0530 Subject: [PATCH 38/54] Update npm configuration --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 143235682..8940f44d7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -187,6 +187,8 @@ jobs: - run: name: Set npm config command: | + npm cache clean --force + npm install -g npm@latest npm config set python python2.7 npm config set msvs_version 2019 - run: From 583899ba3de08d01e0affd4d3abcc05ed12344f1 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Thu, 8 Feb 2024 15:19:03 +0530 Subject: [PATCH 39/54] Update pnpm installation command --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8940f44d7..2372391cd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -166,7 +166,7 @@ jobs: command: choco install rust - run: name: Install pnpm - command: choco install pnpm + command: iwr https://get.pnpm.io/install.ps1 -useb | iex - run: name: Install cmake command: choco install cmake --installargs 'ADD_CMAKE_TO_PATH=User' From 9322e32e01231739be4f1a66fc9be778446d9332 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Thu, 8 Feb 2024 15:21:17 +0530 Subject: [PATCH 40/54] Remove python version check --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2372391cd..8c718e9ef 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -183,7 +183,6 @@ jobs: pnpm --version protoc --version cmake --version - python --version - run: name: Set npm config command: | From d9eb9434c7b2bac352b5edd1f8c4993192abeb7d Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Thu, 8 Feb 2024 15:33:03 +0530 Subject: [PATCH 41/54] Update pnpm installation command --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8c718e9ef..e63918872 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -166,7 +166,7 @@ jobs: command: choco install rust - run: name: Install pnpm - command: iwr https://get.pnpm.io/install.ps1 -useb | iex + command: npm install -g pnpm - run: name: Install cmake command: choco install cmake --installargs 'ADD_CMAKE_TO_PATH=User' From f81e3ce70d25695d5a5f5642dfae43182b39bb58 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Thu, 8 Feb 2024 15:39:39 +0530 Subject: [PATCH 42/54] Update Node.js installation command --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e63918872..915fe038c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -157,7 +157,7 @@ jobs: - checkout - run: name: Install Node.js - command: choco install nodejs --version=18.17.0 + command: choco install nodejs - run: name: Install Deno command: choco install deno From 3953457e5c7434512c0c5bee282b620a0b0a1301 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Thu, 8 Feb 2024 15:52:24 +0530 Subject: [PATCH 43/54] Update CircleCI configuration to install pnpm and check Node.js versions --- .circleci/config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 915fe038c..72cb2fcec 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -166,7 +166,9 @@ jobs: command: choco install rust - run: name: Install pnpm - command: npm install -g pnpm + command: | + nvm list + npm install -g pnpm - run: name: Install cmake command: choco install cmake --installargs 'ADD_CMAKE_TO_PATH=User' From 8268c9bca4b9653513971a8eaecdce3e344a3a77 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Thu, 8 Feb 2024 15:57:23 +0530 Subject: [PATCH 44/54] Add nvm commands to install and use Node.js version 20.4.0 --- .circleci/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 72cb2fcec..1d1e83b4d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -167,6 +167,9 @@ jobs: - run: name: Install pnpm command: | + nvm list + nvm instal 20.4.0 + nvm use 20.4.0 nvm list npm install -g pnpm - run: From bed41212b154943319ada8a9dc9314f66564d2bd Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Thu, 8 Feb 2024 16:02:15 +0530 Subject: [PATCH 45/54] Fix typo in nvm install command --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1d1e83b4d..680a92f97 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -168,7 +168,7 @@ jobs: name: Install pnpm command: | nvm list - nvm instal 20.4.0 + nvm install 20.4.0 nvm use 20.4.0 nvm list npm install -g pnpm From 9932e2a9855f3bf14a9249eb5d5fde46b1bd262e Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Thu, 8 Feb 2024 16:31:40 +0530 Subject: [PATCH 46/54] Update npm version and install pnpm --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 680a92f97..38106ec6a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -171,6 +171,7 @@ jobs: nvm install 20.4.0 nvm use 20.4.0 nvm list + npm install -g npm@latest npm install -g pnpm - run: name: Install cmake From 510504baa71992d5f3155c45a6712c39822d359d Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Thu, 8 Feb 2024 16:37:42 +0530 Subject: [PATCH 47/54] Update Node.js version to 18.17.0 --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 38106ec6a..be6935bb2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -168,8 +168,8 @@ jobs: name: Install pnpm command: | nvm list - nvm install 20.4.0 - nvm use 20.4.0 + nvm install 18.17.0 + nvm use 18.17.0 nvm list npm install -g npm@latest npm install -g pnpm From 7bb35626dfa696b3f0677c2ac84c8c49dcf4473b Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Thu, 8 Feb 2024 16:48:35 +0530 Subject: [PATCH 48/54] Remove npm install -g npm@latest command --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index be6935bb2..6711ef754 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -171,7 +171,6 @@ jobs: nvm install 18.17.0 nvm use 18.17.0 nvm list - npm install -g npm@latest npm install -g pnpm - run: name: Install cmake From d480659e2c068b92667cbd454cd96ce8a908a067 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Thu, 8 Feb 2024 16:52:50 +0530 Subject: [PATCH 49/54] Remove Node.js installation step --- .circleci/config.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6711ef754..86d0ac873 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -155,9 +155,6 @@ jobs: fingerprints: - "SHA256:pSp0IbmprP+NHD1iG2+k2xUeJOG1yTzEnfqRLnUCk3c" - checkout - - run: - name: Install Node.js - command: choco install nodejs - run: name: Install Deno command: choco install deno From dd502c92d0705f33e6e3e17b9514d38f2353ecf9 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Fri, 9 Feb 2024 08:22:25 +0530 Subject: [PATCH 50/54] Update CircleCI configuration to install pnpm and change node version --- .circleci/config.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 86d0ac873..ffdaaab5b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -162,13 +162,14 @@ jobs: name: Install Rust command: choco install rust - run: - name: Install pnpm + name: Chnage node version command: | nvm list nvm install 18.17.0 nvm use 18.17.0 - nvm list - npm install -g pnpm + - run: + name: Install pnpm + command: choco install pnpm - run: name: Install cmake command: choco install cmake --installargs 'ADD_CMAKE_TO_PATH=User' From e8a948e07a06d5f79bdccd7c71f81a56d311bce4 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Fri, 9 Feb 2024 09:06:58 +0530 Subject: [PATCH 51/54] Update CircleCI config to include macOS integration tests --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ffdaaab5b..624ba177d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -357,5 +357,5 @@ workflows: # - integration-tests-js-linux: # requires: # - build - - integration-tests-js-windows - # - integration-tests-js-macos \ No newline at end of file + # - integration-tests-js-windows + - integration-tests-js-macos \ No newline at end of file From b096f848029cd9b53b1f8d4688df97d876d25079 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Fri, 9 Feb 2024 10:13:05 +0530 Subject: [PATCH 52/54] Add Rust target for WebAssembly --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 624ba177d..2ee95ee40 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -248,6 +248,7 @@ jobs: command: | curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y echo 'export PATH="$HOME/.cargo/bin:$PATH"' >> $BASH_ENV + rustup target add wasm32-unknown-unknown - run: name: Install Go command: | From 278059574dc3b6bd4af62e88d7c678fffce9ad46 Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Fri, 9 Feb 2024 10:22:07 +0530 Subject: [PATCH 53/54] Add command to add wasm32-unknown-unknown target for Rust --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2ee95ee40..7b76b3cdb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -248,7 +248,7 @@ jobs: command: | curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y echo 'export PATH="$HOME/.cargo/bin:$PATH"' >> $BASH_ENV - rustup target add wasm32-unknown-unknown + RUN ~/.cargo/bin/rustup target add wasm32-unknown-unknown - run: name: Install Go command: | From 2d3636dd1c9b8711af12c95d90622f6f96af8fbc Mon Sep 17 00:00:00 2001 From: Fayeed Pawaskar Date: Fri, 9 Feb 2024 10:24:52 +0530 Subject: [PATCH 54/54] Add wasm32-unknown-unknown target to Rustup --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7b76b3cdb..e8ee531e8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -248,7 +248,7 @@ jobs: command: | curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y echo 'export PATH="$HOME/.cargo/bin:$PATH"' >> $BASH_ENV - RUN ~/.cargo/bin/rustup target add wasm32-unknown-unknown + ~/.cargo/bin/rustup target add wasm32-unknown-unknown - run: name: Install Go command: |