Merge branch 'dev' into staging

coasys · Dec 8, 2023 · a5d777e · a5d777e
2 parents 94bd1f4 + 5325829
commit a5d777e
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 18 deletions.
diff --git 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
diff --git 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
diff --git 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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
+sed -i "s/const buffer = require('buffer');/import buffer from 'node:buffer';/" ../core/node_modules/safer-buffer/safer.js