From bbd7f7922329021ceb5106bad1bacdd344bcddfa Mon Sep 17 00:00:00 2001 From: Nicolas Luck Date: Wed, 31 Jul 2024 14:55:13 +0200 Subject: [PATCH 1/2] Don't deal with apple cert on linux to fix build and deactivate broken signing for now --- .github/workflows/publish.yml | 13 +++++++------ .github/workflows/publish_staging.yml | 13 +++++++------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index b8b1b989e..c88a25b6d 100644 --- 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 index d98cab8ab..21a6c4fbe 100644 --- 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) From 910214a6e3a7a1055faee511284ee2667097c115 Mon Sep 17 00:00:00 2001 From: Nicolas Luck Date: Wed, 31 Jul 2024 14:57:24 +0200 Subject: [PATCH 2/2] Increase version to rc4 --- Cargo.lock | 8 ++++---- ad4m-hooks/helpers/package.json | 2 +- ad4m-hooks/react/package.json | 2 +- ad4m-hooks/vue/package.json | 2 +- bootstrap-languages/agent-language/package.json | 2 +- bootstrap-languages/direct-message-language/package.json | 2 +- bootstrap-languages/neighbourhood-language/package.json | 2 +- bootstrap-languages/p-diff-sync/package.json | 2 +- bootstrap-languages/perspective-language/package.json | 2 +- cli/Cargo.toml | 6 +++--- connect/package.json | 2 +- core/package.json | 2 +- docs/package.json | 2 +- executor/package.json | 2 +- executor/src/core/Config.ts | 2 +- package.json | 2 +- rust-client/Cargo.toml | 2 +- rust-executor/Cargo.toml | 4 ++-- rust-executor/package.json | 2 +- rust-executor/src/globals.rs | 2 +- test-runner/package.json | 2 +- tests/js/package.json | 2 +- ui/package.json | 2 +- ui/src-tauri/Cargo.toml | 2 +- ui/src-tauri/tauri.conf.json | 2 +- 25 files changed, 31 insertions(+), 31 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a58ac9529..a38b38972 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14,7 +14,7 @@ dependencies = [ [[package]] name = "ad4m" -version = "0.10.0-rc3" +version = "0.10.0-rc4" dependencies = [ "ad4m-client", "ad4m-executor", @@ -39,7 +39,7 @@ dependencies = [ [[package]] name = "ad4m-client" -version = "0.10.0-rc3" +version = "0.10.0-rc4" dependencies = [ "anyhow", "async-tungstenite", @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "ad4m-executor" -version = "0.10.0-rc3" +version = "0.10.0-rc4" dependencies = [ "ad4m-client", "argon2", @@ -127,7 +127,7 @@ dependencies = [ [[package]] name = "ad4m-launcher" -version = "0.10.0-rc3" +version = "0.10.0-rc4" dependencies = [ "ad4m-client", "ad4m-executor", diff --git a/ad4m-hooks/helpers/package.json b/ad4m-hooks/helpers/package.json index 19031dda2..7ecff83f2 100644 --- 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 index 8ffcc1b1a..921083996 100644 --- 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 index fe6e22c38..9124a127a 100644 --- 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 index 86eaba01a..10d3181ce 100644 --- 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 index e2c86e038..b99b39918 100644 --- 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 index b51b60597..226b04928 100644 --- a/bootstrap-languages/neighbourhood-language/package.json +++ b/bootstrap-languages/neighbourhood-language/package.json @@ -8,5 +8,5 @@ }, "author": "joshuadparkin@gmail.com", "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 index 1b2d6b9cd..5fe489914 100644 --- 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 index 34d599eba..52121daf6 100644 --- 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 index bc3c67e73..56d27b06a 100644 --- 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 "] @@ -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 index 379899189..59ecc8330 100644 --- 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 index 3e29c476b..ed723abe8 100644 --- 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": { "graphql@15.7.2": "patches/graphql@15.7.2.patch" diff --git a/docs/package.json b/docs/package.json index e9077db57..dabfbe5be 100644 --- 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 index 5eca3dcbb..8184c3e38 100644 --- 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 index 55ee26515..acd066cd2 100644 --- 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 index e4e6f543e..3911a6f94 100644 --- a/package.json +++ b/package.json @@ -93,5 +93,5 @@ "safer-buffer@2.1.2": "patches/safer-buffer@2.1.2.patch" } }, - "version": "0.10.0-rc3" + "version": "0.10.0-rc4" } diff --git a/rust-client/Cargo.toml b/rust-client/Cargo.toml index 294d3473b..ccee8852a 100644 --- 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 "] description = "Client library wrapping AD4M's GraphQL interface" diff --git a/rust-executor/Cargo.toml b/rust-executor/Cargo.toml index 04d38ec65..16cc19691 100644 --- 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 "] 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 index 66ae265ab..3776a9bf7 100644 --- 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 index 11b389675..e29680b8d 100644 --- 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 index 9ff48c3da..0fe388b54 100644 --- 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 index 0d6d5f042..881e1a1c7 100644 --- 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 index 5ae1fca8a..c04bbef76 100644 --- 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 index 6a80f1ba7..2063c8574 100644 --- 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 index bab64bd50..f22476105 100644 --- 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",