diff --git a/.github/workflows/agent-language-tests.yml b/.github/workflows/agent-language-tests.yml index b3c091118..43e4af064 100644 --- a/.github/workflows/agent-language-tests.yml +++ b/.github/workflows/agent-language-tests.yml @@ -56,6 +56,6 @@ jobs: - run: rustup target add wasm32-unknown-unknown - run: pnpm install - - run: cargo install holochain_cli --version 0.2.2 || echo "hc already installed" + - run: cargo install holochain_cli --version 0.3.0-beta-dev.27 || echo "hc already installed" - run: pnpm run build-languages - run: cd bootstrap-languages/agent-language/hc-dna/zomes/tests && pnpm install && pnpm run test \ No newline at end of file diff --git a/.github/workflows/direct-message-language-tests.yml b/.github/workflows/direct-message-language-tests.yml index 1b8a506dd..7ddc88e12 100644 --- a/.github/workflows/direct-message-language-tests.yml +++ b/.github/workflows/direct-message-language-tests.yml @@ -56,6 +56,6 @@ jobs: - run: rustup target add wasm32-unknown-unknown - run: pnpm install - - run: cargo install holochain_cli --version 0.2.2 || echo "hc already installed" + - run: cargo install holochain_cli --version 0.3.0-beta-dev.27 || echo "hc already installed" - run: pnpm run build-languages - run: cd bootstrap-languages/direct-message-language/hc-dna/tests && pnpm install && pnpm run test \ No newline at end of file diff --git a/.github/workflows/file-storage-language-tests.yml b/.github/workflows/file-storage-language-tests.yml index 834250e11..4bca3db9a 100644 --- a/.github/workflows/file-storage-language-tests.yml +++ b/.github/workflows/file-storage-language-tests.yml @@ -105,6 +105,6 @@ jobs: - run: rustup target add wasm32-unknown-unknown - run: pnpm install - - run: cargo install holochain_cli --version 0.2.2 || echo "hc already installed" + - run: cargo install holochain_cli --version 0.3.0-beta-dev.27 || echo "hc already installed" - run: pnpm run build - run: cd bootstrap-languages/file-storage && pnpm run integration-test \ No newline at end of file diff --git a/.github/workflows/integration_cli.yml b/.github/workflows/integration_cli.yml index a39d2bb26..a6a190a79 100644 --- a/.github/workflows/integration_cli.yml +++ b/.github/workflows/integration_cli.yml @@ -64,7 +64,7 @@ jobs: go-version: '1.20' - name: Install HC - run: cargo install holochain_cli --version 0.2.2 || echo "hc already installed" + run: cargo install holochain_cli --version 0.3.0-beta-dev.27 || echo "hc already installed" - name: pnpm Install run: pnpm install --no-frozen-lockfile diff --git a/.github/workflows/integration_js.yml b/.github/workflows/integration_js.yml index f50cb2be8..22d1f7fc0 100644 --- a/.github/workflows/integration_js.yml +++ b/.github/workflows/integration_js.yml @@ -66,7 +66,7 @@ jobs: sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf protobuf-compiler cmake - name: Install HC - run: cargo install holochain_cli --version 0.2.2 || echo "hc already installed" + run: cargo install holochain_cli --version 0.3.0-beta-dev.27 || echo "hc already installed" - name: Install dependencies run: pnpm install --no-frozen-lockfile diff --git a/.github/workflows/p-diff-sync-tests.yml b/.github/workflows/p-diff-sync-tests.yml index b8aafd702..0c656edc2 100644 --- a/.github/workflows/p-diff-sync-tests.yml +++ b/.github/workflows/p-diff-sync-tests.yml @@ -84,7 +84,7 @@ jobs: - run: rustup target add wasm32-unknown-unknown - run: pnpm install - - run: cargo install holochain_cli --version 0.2.2 || echo "hc already installed" + - run: cargo install holochain_cli --version 0.3.0-beta-dev.27 || echo "hc already installed" - run: pnpm run build-languages - run: cd bootstrap-languages/p-diff-sync/hc-dna/zomes/tests && pnpm install && pnpm run test-pull diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 07b25f822..4934c1349 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -71,9 +71,6 @@ jobs: with: go-version: '1.20.6' - - name: Install HC - run: cargo install holochain_cli --version 0.2.2 || echo "hc already installed" - - name: Install Deno uses: denoland/setup-deno@v1 with: diff --git a/.github/workflows/publish_staging.yml b/.github/workflows/publish_staging.yml index 7429186bd..b7c7210be 100644 --- a/.github/workflows/publish_staging.yml +++ b/.github/workflows/publish_staging.yml @@ -113,9 +113,6 @@ jobs: with: go-version: '1.20.6' - - name: Install HC - run: cargo install holochain_cli --version 0.2.2 || echo "hc already installed" - - name: pnpm Install run: pnpm install --no-cache diff --git a/ui/package.json b/ui/package.json index bcdaefe44..73bd4e93b 100644 --- a/ui/package.json +++ b/ui/package.json @@ -30,9 +30,9 @@ "build": "vite build", "change-ui-version": "powershell -ExecutionPolicy Bypass -File ./scripts/patch-prerelease-tags.ps1", "package-ad4m": "run-script-os", - "package-ad4m:windows": "cargo clean && powershell -ExecutionPolicy Bypass -File ./scripts/patch-prerelease-tags.ps1 && pnpm run build && pnpm tauri build --verbose && powershell -ExecutionPolicy Bypass -File ./scripts/reverse-patch-prerelease-tags.ps1", + "package-ad4m:windows": "cargo clean && pnpm run build && pnpm tauri build --verbose", "package-ad4m:macos": "pnpm run build && pnpm tauri build --verbose", - "package-ad4m:linux": "pnpm run build && ./scripts/patch-safe-buffer.sh && pnpm tauri build --verbose && ./scripts/reverse-patch-safe-buffer.sh" + "package-ad4m:linux": "pnpm run build && pnpm tauri build --verbose" }, "eslintConfig": { "extends": [ diff --git a/ui/scripts/patch-safe-buffer.sh b/ui/scripts/patch-safe-buffer.sh index dc324640c..0f1df4e32 100755 --- a/ui/scripts/patch-safe-buffer.sh +++ b/ui/scripts/patch-safe-buffer.sh @@ -1,5 +1,5 @@ #/bin/bash -sed -i "s/import buffer from 'node:buffer';/const buffer = require('buffer');/" ../node_modules/safe-buffer/index.js +sed -i "s/import buffer from 'node:buffer';/const buffer = require('buffer');/" ../core/node_modules/safe-buffer/index.js -sed -i "s/import buffer from 'node:buffer'/const buffer = require('buffer');/" ../node_modules/safer-buffer/safer.js +sed -i "s/import buffer from 'node:buffer'/const buffer = require('buffer');/" ../core/node_modules/safer-buffer/safer.js diff --git a/ui/scripts/reverse-patch-safe-buffer.sh b/ui/scripts/reverse-patch-safe-buffer.sh index 79ecc795a..098ddcd89 100755 --- a/ui/scripts/reverse-patch-safe-buffer.sh +++ b/ui/scripts/reverse-patch-safe-buffer.sh @@ -1,5 +1,5 @@ #/bin/bash -sed -i "s/const buffer = require('buffer');/import buffer from 'node:buffer';/" ../node_modules/safe-buffer/index.js +sed -i "s/const buffer = require('buffer');/import buffer from 'node:buffer';/" ../core/node_modules/safe-buffer/index.js -sed -i "s/const buffer = require('buffer');/import buffer from 'node:buffer';/" ../node_modules/safer-buffer/safer.js \ No newline at end of file +sed -i "s/const buffer = require('buffer');/import buffer from 'node:buffer';/" ../core/node_modules/safer-buffer/safer.js \ No newline at end of file