Merge branch 'dev' into staging

coasys · Jul 31, 2024 · 4f9c622 · 4f9c622
2 parents 335efa5 + 910214a
commit 4f9c622
Show file tree

Hide file tree

Showing 27 changed files with 45 additions and 43 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -136,6 +136,7 @@ jobs:
       run: cd ./core && pnpm install
 
     - name: Decrypt and install certificates
+      if: matrix.platform == 'macos-latest'
       env:
         APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
         APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
@@ -153,12 +154,12 @@ jobs:
       env:
         TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
         TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
-        APPLE_ID: ${{ secrets.APPLE_ID }}
-        APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
-        APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
-        APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
-        APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
-        APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }}
+        #APPLE_ID: ${{ secrets.APPLE_ID }}
+        #APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
+        #APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
+        #APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
+        #APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+        #APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }}
       run: pnpm run package-ad4m
 
     - name:  Build AD4M-CLI & build Launcher binary (windows-latest)

diff --git a/.github/workflows/publish_staging.yml b/.github/workflows/publish_staging.yml
@@ -133,6 +133,7 @@ jobs:
       run: cd ./core && pnpm install --no-cache
 
     - name: Decrypt and install certificates
+      if: matrix.platform == 'macos-latest'
       env:
         APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
         APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
@@ -150,12 +151,12 @@ jobs:
       env:
         TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
         TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
-        APPLE_ID: ${{ secrets.APPLE_ID }}
-        APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
-        APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
-        APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
-        APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
-        APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }}
+        #APPLE_ID: ${{ secrets.APPLE_ID }}
+        #APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
+        #APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
+        #APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
+        #APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+        #APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }}
       run: pnpm run package-ad4m
 
     - name:  Build AD4M-CLI & build Launcher binary (windows-latest)

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ad4m-hooks/helpers/package.json b/ad4m-hooks/helpers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coasys/hooks-helpers",
-  "version": "0.10.0-rc3",
+  "version": "0.10.0-rc4",
   "description": "",
   "main": "./src/index.ts",
   "module": "./src/index.ts",

diff --git a/ad4m-hooks/react/package.json b/ad4m-hooks/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coasys/ad4m-react-hooks",
-  "version": "0.10.0-rc3",
+  "version": "0.10.0-rc4",
   "description": "",
   "main": "./src/index.ts",
   "module": "./src/index.ts",

diff --git a/ad4m-hooks/vue/package.json b/ad4m-hooks/vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coasys/ad4m-vue-hooks",
-  "version": "0.10.0-rc3",
+  "version": "0.10.0-rc4",
   "description": "",
   "main": "./src/index.ts",
   "module": "./src/index.ts",

diff --git a/bootstrap-languages/agent-language/package.json b/bootstrap-languages/agent-language/package.json
@@ -44,5 +44,5 @@
     "md5": "^2.3.0",
     "postcss": "^8.2.1"
   },
-  "version": "0.10.0-rc3"
+  "version": "0.10.0-rc4"
 }
diff --git a/bootstrap-languages/direct-message-language/package.json b/bootstrap-languages/direct-message-language/package.json
@@ -35,5 +35,5 @@
   "dependencies": {
     "@types/node": "^18.0.0"
   },
-  "version": "0.10.0-rc3"
+  "version": "0.10.0-rc4"
 }
diff --git a/bootstrap-languages/neighbourhood-language/package.json b/bootstrap-languages/neighbourhood-language/package.json
@@ -8,5 +8,5 @@
   },
   "author": "[email protected]",
   "license": "ISC",
-  "version": "0.10.0-rc3"
+  "version": "0.10.0-rc4"
 }
diff --git a/bootstrap-languages/p-diff-sync/package.json b/bootstrap-languages/p-diff-sync/package.json
@@ -38,5 +38,5 @@
   "devDependencies": {
     "run-script-os": "^1.1.6"
   },
-  "version": "0.10.0-rc3"
+  "version": "0.10.0-rc4"
 }
diff --git a/bootstrap-languages/perspective-language/package.json b/bootstrap-languages/perspective-language/package.json
@@ -30,5 +30,5 @@
     "typescript": "^4.5.5",
     "uint8arrays": "^3.0.0"
   },
-  "version": "0.10.0-rc3"
+  "version": "0.10.0-rc4"
 }
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "ad4m"
 
-version = "0.10.0-rc3"
+version = "0.10.0-rc4"
 
 edition = "2021"
 authors = ["Nicolas Luck <[email protected]>"]
@@ -24,8 +24,8 @@ path = "src/ad4m_executor.rs"
 [dependencies]
 
 
-ad4m-client = { path = "../rust-client", version="0.10.0-rc3"}
-ad4m-executor = { path = "../rust-executor", version="0.10.0-rc3" }
+ad4m-client = { path = "../rust-client", version="0.10.0-rc4"}
+ad4m-executor = { path = "../rust-executor", version="0.10.0-rc4" }
 anyhow = "1.0.65"
 clap = { version = "4.0.8", features = ["derive"] }
 futures = "0.3"

diff --git a/connect/package.json b/connect/package.json
@@ -66,5 +66,5 @@
     "esbuild-plugin-replace": "^1.4.0",
     "lit": "^2.3.1"
   },
-  "version": "0.10.0-rc3"
+  "version": "0.10.0-rc4"
 }
diff --git a/core/package.json b/core/package.json
@@ -60,7 +60,7 @@
     "@types/yargs": "*"
   },
   "patchedDependencies": {},
-  "version": "0.10.0-rc3",
+  "version": "0.10.0-rc4",
   "pnpm": {
     "patchedDependencies": {
       "[email protected]": "patches/[email protected]"

diff --git a/docs/package.json b/docs/package.json
@@ -22,5 +22,5 @@
     "typedoc-plugin-markdown": "^3.15.2",
     "typescript": "^4.9.3"
   },
-  "version": "0.10.0-rc3"
+  "version": "0.10.0-rc4"
 }
diff --git a/executor/package.json b/executor/package.json
@@ -78,5 +78,5 @@
     "tmp": "^0.2.1",
     "uuid": "*"
   },
-  "version": "0.10.0-rc3"
+  "version": "0.10.0-rc4"
 }
diff --git a/executor/src/core/Config.ts b/executor/src/core/Config.ts
@@ -2,7 +2,7 @@ import * as path from 'node:path';
 import * as fs from 'node:fs';
 import { Address, Expression } from '@coasys/ad4m';
 
-export let ad4mExecutorVersion = "0.10.0-rc3";
+export let ad4mExecutorVersion = "0.10.0-rc4";
 export let agentLanguageAlias = "did";
 export let languageLanguageAlias = "lang";
 export let neighbourhoodLanguageAlias = "neighbourhood";

diff --git a/package.json b/package.json
@@ -93,5 +93,5 @@
       "[email protected]": "patches/[email protected]"
     }
   },
-  "version": "0.10.0-rc3"
+  "version": "0.10.0-rc4"
 }
diff --git a/rust-client/Cargo.toml b/rust-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ad4m-client"
-version = "0.10.0-rc3"
+version = "0.10.0-rc4"
 edition = "2021"
 authors = ["Nicolas Luck <[email protected]>"]
 description = "Client library wrapping AD4M's GraphQL interface"

diff --git a/rust-executor/Cargo.toml b/rust-executor/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ad4m-executor"
-version = "0.10.0-rc3"
+version = "0.10.0-rc4"
 edition = "2021"
 authors = ["Nicolas Luck <[email protected]>"]
 description = "Runtime implementation of AD4M as library - https://ad4m.dev"
@@ -89,7 +89,7 @@ kitsune_p2p_types = { version = "0.3.2-rc.0", git = "https://github.com/coasys/h
 scryer-prolog = { version = "0.9.4" }
 # scryer-prolog = { path = "../../scryer-prolog", features = ["multi_thread"] }
 
-ad4m-client = { path = "../rust-client", version="0.10.0-rc3" }
+ad4m-client = { path = "../rust-client", version="0.10.0-rc4" }
 reqwest = { version = "0.11.20", features = ["json", "native-tls"] }
 
 rusqlite = { version = "0.29.0", git = "https://github.com/coasys/rusqlite.git", rev = "12ec1330bd4b46411ab9895364da4a3e172d0fbb", features = ["bundled"] }

diff --git a/rust-executor/package.json b/rust-executor/package.json
@@ -31,5 +31,5 @@
     "@coasys/ad4m-executor": "link:../core"
   },
   "dependencies": {},
-  "version": "0.10.0-rc3"
+  "version": "0.10.0-rc4"
 }
diff --git a/rust-executor/src/globals.rs b/rust-executor/src/globals.rs
@@ -2,7 +2,7 @@ use lazy_static::lazy_static;
 
 lazy_static! {
     /// The current version of AD4M
-    pub static ref AD4M_VERSION: String = String::from("0.10.0-rc3");
+    pub static ref AD4M_VERSION: String = String::from("0.10.0-rc4");
 }
 
 /// Struct representing oldest supported version and indicator if state should be cleared if update is required

diff --git a/test-runner/package.json b/test-runner/package.json
@@ -63,5 +63,5 @@
   "bugs": {
     "url": "https://github.com/perspect3vism/ad4m-test/issues"
   },
-  "version": "0.10.0-rc3"
+  "version": "0.10.0-rc4"
 }
diff --git a/tests/js/package.json b/tests/js/package.json
@@ -64,5 +64,5 @@
   "dependencies": {
     "uuid": "*"
   },
-  "version": "0.10.0-rc3"
+  "version": "0.10.0-rc4"
 }
diff --git a/ui/package.json b/ui/package.json
@@ -71,5 +71,5 @@
   "resolutions": {
     "react-error-overlay": "6.0.9"
   },
-  "version": "0.10.0-rc3"
+  "version": "0.10.0-rc4"
 }
diff --git a/ui/src-tauri/Cargo.toml b/ui/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ad4m-launcher"
-version = "0.10.0-rc3"
+version = "0.10.0-rc4"
 description = "Administration of ad4m services"
 authors = ["Kaichao Sun"]
 license = ""

diff --git a/ui/src-tauri/tauri.conf.json b/ui/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
   "package": {
     "productName": "ADAM Launcher",
-    "version": "0.10.0-rc3"
+    "version": "0.10.0-rc4"
   },
   "build": {
     "distDir": "../dist",