diff --git a/.github/workflows/agent-language-tests.yml b/.github/workflows/agent-language-tests.yml index 3fab49960..e8e30d513 100644 --- a/.github/workflows/agent-language-tests.yml +++ b/.github/workflows/agent-language-tests.yml @@ -26,7 +26,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions-rs/toolchain@v1 with: - toolchain: 1.71.1 + toolchain: 1.73.0 - name: Cache cargo id: cache-cargo diff --git a/.github/workflows/direct-message-language-tests.yml b/.github/workflows/direct-message-language-tests.yml index 79c003454..2b2892ddb 100644 --- a/.github/workflows/direct-message-language-tests.yml +++ b/.github/workflows/direct-message-language-tests.yml @@ -26,7 +26,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions-rs/toolchain@v1 with: - toolchain: 1.71.1 + toolchain: 1.73.0 - name: Cache cargo id: cache-cargo diff --git a/.github/workflows/file-storage-language-tests.yml b/.github/workflows/file-storage-language-tests.yml index cef568be1..21d4e2870 100644 --- a/.github/workflows/file-storage-language-tests.yml +++ b/.github/workflows/file-storage-language-tests.yml @@ -26,7 +26,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions-rs/toolchain@v1 with: - toolchain: 1.71.1 + toolchain: 1.73.0 - name: Cache cargo id: cache-cargo @@ -72,7 +72,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions-rs/toolchain@v1 with: - toolchain: 1.71.1 + toolchain: 1.73.0 - name: Cache cargo id: cache-cargo diff --git a/.github/workflows/integration_cli.yml b/.github/workflows/integration_cli.yml index 899a174e8..cb658698a 100644 --- a/.github/workflows/integration_cli.yml +++ b/.github/workflows/integration_cli.yml @@ -26,7 +26,7 @@ jobs: uses: actions-rs/toolchain@v1 with: override: true - toolchain: 1.71.1 + toolchain: 1.73.0 - name: Install protobuf & cmake run: brew install protobuf cmake diff --git a/.github/workflows/integration_js.yml b/.github/workflows/integration_js.yml index 98fd82b3e..5c28a5088 100644 --- a/.github/workflows/integration_js.yml +++ b/.github/workflows/integration_js.yml @@ -23,7 +23,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions-rs/toolchain@v1 with: - toolchain: 1.71.1 + toolchain: 1.73.0 - name: Install GO uses: actions/setup-go@v4 diff --git a/.github/workflows/p-diff-sync-tests.yml b/.github/workflows/p-diff-sync-tests.yml index 43c950aee..1ebad17b6 100644 --- a/.github/workflows/p-diff-sync-tests.yml +++ b/.github/workflows/p-diff-sync-tests.yml @@ -26,7 +26,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions-rs/toolchain@v1 with: - toolchain: 1.71.1 + toolchain: 1.73.0 - name: Cache cargo id: cache-cargo uses: actions/cache@v3 @@ -55,7 +55,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions-rs/toolchain@v1 with: - toolchain: 1.71.1 + toolchain: 1.73.0 - name: Cache cargo id: cache-cargo uses: actions/cache@v3 @@ -100,7 +100,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions-rs/toolchain@v1 with: - toolchain: 1.71.1 + toolchain: 1.73.0 - name: Cache cargo id: cache-cargo @@ -146,7 +146,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions-rs/toolchain@v1 with: - toolchain: 1.71.1 + toolchain: 1.73.0 - name: Cache cargo id: cache-cargo @@ -192,7 +192,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions-rs/toolchain@v1 with: - toolchain: 1.71.1 + toolchain: 1.73.0 - name: Cache cargo id: cache-cargo @@ -239,7 +239,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions-rs/toolchain@v1 with: - toolchain: 1.71.1 + toolchain: 1.73.0 - name: Cache cargo id: cache-cargo @@ -285,7 +285,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions-rs/toolchain@v1 with: - toolchain: 1.71.1 + toolchain: 1.73.0 - name: Cache cargo id: cache-cargo @@ -331,7 +331,7 @@ jobs: # - uses: actions/checkout@v2 # - uses: actions-rs/toolchain@v1 # with: - # toolchain: 1.71.1 + # toolchain: 1.73.0 # - name: Cache cargo # id: cache-cargo diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 3b06e6c4b..d19ee7b9f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -43,7 +43,7 @@ jobs: fail-fast: false matrix: platform: [GH-hosted-ubuntu, macos-latest, windows-latest] - node-version: [18.17.0] + node-version: [16.x] needs: - create-release @@ -59,18 +59,21 @@ jobs: uses: actions-rs/toolchain@v1 with: override: true - toolchain: 1.71.1 + toolchain: 1.73.0 + - run: rustup target add wasm32-unknown-unknown - name: Install GO uses: actions/setup-go@v4 with: - go-version: '1.18' + 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: deno-version: v1.32.4 - - run: rustup target add wasm32-unknown-unknown - name: install dependencies (ubuntu only) if: matrix.platform == 'GH-hosted-ubuntu' @@ -84,7 +87,7 @@ jobs: - name: install dependencies (windows only) if: matrix.platform == 'windows-latest' - run: choco install protoc cmake + run: choco install protoc cmake curl cygwin gnuwin32-m4 libgcc make mingw - name: get version run: echo "PACKAGE_VERSION=$(node -p "require('./ui/package.json').version")" >> $GITHUB_ENV @@ -95,6 +98,17 @@ jobs: with: path: ui + - name: Change package UI version + id: changed_version + if: matrix.platform == 'windows-latest' + run: cd ui && yarn change-ui-version + + - name: Extract changed version + id: changed_extract_version + uses: Saionaro/extract-package-version@v1.1.1 + with: + path: ui + - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v1 with: @@ -106,10 +120,10 @@ jobs: - name: Build AD4M-CLI & build Launcher binary (macos/linux-latest) if: matrix.platform != 'windows-latest' env: - ENABLE_CODE_SIGNING: ${{ secrets.APPLE_CERTIFICATE }} + TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} + TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }} APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }} - APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }} APPLE_ID: ${{ secrets.APPLE_ID }} APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }} run: yarn run package-ad4m @@ -119,9 +133,7 @@ jobs: env: TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} - run: | - choco install curl cygwin gnuwin32-m4 libgcc make mingw - yarn run package-ad4m + run: yarn run package-ad4m - name: Upload Release Deb Asset id: upload-release-deb-asset @@ -239,8 +251,8 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ needs.create-release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps - asset_path: D:\a\ad4m\ad4m\target\release\bundle\msi\ADAM\ Launcher_${{ steps.extract_version.outputs.version }}_x64_en-US.msi - asset_name: ADAM\ Launcher_${{ steps.extract_version.outputs.version }}_x64_en-US.msi + asset_path: D:\a\ad4m\ad4m\target\release\bundle\msi\ADAM\ Launcher_${{ steps.changed_extract_version.outputs.version }}_x64_en-US.msi + asset_name: ADAM\ Launcher_${{ steps.changed_extract_version.outputs.version }}_x64_en-US.msi asset_content_type: application/octet-stream - name: Upload Release MSI update Asset @@ -251,8 +263,8 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ needs.create-release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps - asset_path: D:\a\ad4m\ad4m\target\release\bundle\msi\ADAM\ Launcher_${{ steps.extract_version.outputs.version }}_x64_en-US.msi.zip - asset_name: ADAM\ Launcher_${{ steps.extract_version.outputs.version }}_x64_en-US.msi.zip + asset_path: D:\a\ad4m\ad4m\target\release\bundle\msi\ADAM\ Launcher_${{ steps.changed_extract_version.outputs.version }}_x64_en-US.msi.zip + asset_name: ADAM\ Launcher_${{ steps.changed_extract_version.outputs.version }}_x64_en-US.msi.zip asset_content_type: application/octet-stream - name: Upload Release MSI update sig Asset @@ -263,21 +275,21 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ needs.create-release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps - asset_path: D:\a\ad4m\ad4m\target\release\bundle\msi\ADAM\ Launcher_${{ steps.extract_version.outputs.version }}_x64_en-US.msi.zip.sig - asset_name: ADAM\ Launcher_${{ steps.extract_version.outputs.version }}_x64_en-US.msi.zip.sig + asset_path: D:\a\ad4m\ad4m\target\release\bundle\msi\ADAM\ Launcher_${{ steps.changed_extract_version.outputs.version }}_x64_en-US.msi.zip.sig + asset_name: ADAM\ Launcher_${{ steps.changed_extract_version.outputs.version }}_x64_en-US.msi.zip.sig asset_content_type: application/octet-stream - - name: Upload Release AD4M CLI Windows Binary - id: upload-release-windows-ad4m-cli-binary - if: matrix.platform == 'windows-latest' - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ needs.create-release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps - asset_path: D:\a\ad4m\ad4m\target\release\ad4m-x64.exe - asset_name: ad4m-windows-${{ steps.extract_version.outputs.version }}-x64.exe - asset_content_type: application/octet-stream + # - name: Upload Release AD4M CLI Windows Binary + # id: upload-release-windows-ad4m-cli-binary + # if: matrix.platform == 'windows-latest' + # uses: actions/upload-release-asset@v1 + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # with: + # upload_url: ${{ needs.create-release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps + # asset_path: D:\a\ad4m\ad4m\target\release\ad4m-x64.exe + # asset_name: ad4m-windows-${{ steps.extract_version.outputs.version }}-x64.exe + # asset_content_type: application/octet-stream npm-publish: runs-on: GH-hosted-ubuntu @@ -309,6 +321,12 @@ jobs: - name: Build modules run: yarn run build-libs + + - name: Change Package Visibility to Public + run: | + cd core + sed -i 's/"private": true/"private": false/' package.json + - name: Publish core uses: JS-DevTools/npm-publish@v1 with: @@ -340,7 +358,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions-rs/toolchain@v1 with: - toolchain: 1.71.1 + toolchain: 1.73.0 override: true - name: Install GO diff --git a/.github/workflows/publish_staging.yml b/.github/workflows/publish_staging.yml index 8d233bcca..545b2dff1 100644 --- a/.github/workflows/publish_staging.yml +++ b/.github/workflows/publish_staging.yml @@ -43,7 +43,7 @@ jobs: fail-fast: false matrix: platform: [GH-hosted-ubuntu, macos-latest, windows-latest] - node-version: [18.17.0] + node-version: [16.x] needs: - create-release @@ -57,12 +57,13 @@ jobs: uses: actions-rs/toolchain@v1 with: override: true - toolchain: 1.71.1 + toolchain: 1.73.0 + - run: rustup target add wasm32-unknown-unknown + - name: Install Deno uses: denoland/setup-deno@v1 with: deno-version: v1.32.4 - - run: rustup target add wasm32-unknown-unknown - name: install dependencies (ubuntu only) if: matrix.platform == 'GH-hosted-ubuntu' @@ -76,7 +77,7 @@ jobs: - name: install dependencies (windows only) if: matrix.platform == 'windows-latest' - run: choco install protoc cmake + run: choco install protoc cmake curl cygwin gnuwin32-m4 msys2 make mingw - name: get version run: echo "PACKAGE_VERSION=$(node -p "require('./ui/package.json').version")" >> $GITHUB_ENV @@ -87,6 +88,17 @@ jobs: with: path: ui + - name: Change package UI version + id: changed_version + if: matrix.platform == 'windows-latest' + run: cd ui && yarn change-ui-version + + - name: Extract changed version + id: changed_extract_version + uses: Saionaro/extract-package-version@v1.1.1 + with: + path: ui + - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v1 with: @@ -95,7 +107,10 @@ jobs: - name: Install GO uses: actions/setup-go@v4 with: - go-version: '1.18' + go-version: '1.20.6' + + - name: Install HC + run: cargo install holochain_cli --version 0.2.2 || echo "hc already installed" - name: Yarn Install run: yarn install --no-cache @@ -105,38 +120,18 @@ jobs: env: TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} - run: yarn run build - - - name: Build the app - uses: tauri-apps/tauri-action@v0 - env: - ENABLE_CODE_SIGNING: ${{ secrets.APPLE_CERTIFICATE }} APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }} APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }} - APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }} APPLE_ID: ${{ secrets.APPLE_ID }} APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }} - with: - tagName: v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version - releaseName: 'ADAM Launcher v__VERSION__' - releaseBody: 'See the assets to download this version and install.' - releaseDraft: true - prerelease: false + run: yarn run package-ad4m - name: Build AD4M-CLI & build Launcher binary (windows-latest) if: matrix.platform == 'windows-latest' env: TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} - ENABLE_CODE_SIGNING: ${{ secrets.APPLE_CERTIFICATE }} - APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }} - APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }} - APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }} - APPLE_ID: ${{ secrets.APPLE_ID }} - APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }} - run: | - choco install curl cygwin gnuwin32-m4 libgcc make mingw - yarn run package-ad4m + run: yarn run package-ad4m - name: Upload Release Deb Asset id: upload-release-deb-asset @@ -206,7 +201,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ needs.create-release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps - asset_path: "/Users/runner/work/ad4m/target/release/bundle/dmg/ADAM Launcher_${{ steps.extract_version.outputs.version }}_x64.dmg" + asset_path: "/Users/runner/work/ad4m/ad4m/target/release/bundle/dmg/ADAM Launcher_${{ steps.extract_version.outputs.version }}_x64.dmg" asset_name: ADAM\ Launcher_${{ steps.extract_version.outputs.version }}_x64.dmg asset_content_type: application/octet-stream @@ -242,7 +237,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ needs.create-release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps - asset_path: /Users/runner/work/ad4m/target/release/ad4m + asset_path: /Users/runner/work/ad4m/ad4m/target/release/ad4m asset_name: ad4m-macos-${{ steps.extract_version.outputs.version }}-x64 asset_content_type: application/octet-stream @@ -254,8 +249,8 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ needs.create-release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps - asset_path: 'D:\a\ad4m\ad4m\target\release\bundle\msi\ADAM Launcher_${{ steps.extract_version.outputs.version }}_x64_en-US.msi' - asset_name: ADAM\ Launcher_${{ steps.extract_version.outputs.version }}_x64_en-US.msi + asset_path: 'D:\a\ad4m\ad4m\target\release\bundle\msi\ADAM Launcher_${{ steps.changed_extract_version.outputs.version }}_x64_en-US.msi' + asset_name: ADAM\ Launcher_${{ steps.changed_extract_version.outputs.version }}_x64_en-US.msi asset_content_type: application/octet-stream - name: Upload Release MSI update Asset @@ -266,8 +261,8 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ needs.create-release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps - asset_path: 'D:\a\ad4m\ad4m\target\release\bundle\msi\ADAM Launcher_${{ steps.extract_version.outputs.version }}_x64_en-US.msi.zip' - asset_name: ADAM\ Launcher_${{ steps.extract_version.outputs.version }}_x64_en-US.msi.zip + asset_path: 'D:\a\ad4m\ad4m\target\release\bundle\msi\ADAM Launcher_${{ steps.changed_extract_version.outputs.version }}_x64_en-US.msi.zip' + asset_name: ADAM\ Launcher_${{ steps.changed_extract_version.outputs.version }}_x64_en-US.msi.zip asset_content_type: application/octet-stream - name: Upload Release MSI update sig Asset @@ -278,21 +273,21 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ needs.create-release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps - asset_path: 'D:\a\ad4m\ad4m\target\release\bundle\msi\ADAM Launcher_${{ steps.extract_version.outputs.version }}_x64_en-US.msi.zip.sig' - asset_name: ADAM\ Launcher_${{ steps.extract_version.outputs.version }}_x64_en-US.msi.zip.sig + asset_path: 'D:\a\ad4m\ad4m\target\release\bundle\msi\ADAM Launcher_${{ steps.changed_extract_version.outputs.version }}_x64_en-US.msi.zip.sig' + asset_name: ADAM\ Launcher_${{ steps.changed_extract_version.outputs.version }}_x64_en-US.msi.zip.sig asset_content_type: application/octet-stream - - name: Upload Release AD4M CLI Windows Binary - id: upload-release-windows-ad4m-cli-binary - if: matrix.platform == 'windows-latest' - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ needs.create-release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps - asset_path: D:\a\ad4m\ad4m\target\release\ad4m-x64.exe - asset_name: ad4m-windows-${{ steps.extract_version.outputs.version }}-x64.exe - asset_content_type: application/octet-stream + # - name: Upload Release AD4M CLI Windows Binary + # id: upload-release-windows-ad4m-cli-binary + # if: matrix.platform == 'windows-latest' + # uses: actions/upload-release-asset@v1 + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # with: + # upload_url: ${{ needs.create-release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps + # asset_path: D:\a\ad4m\ad4m\target\release\ad4m-x64.exe + # asset_name: ad4m-windows-${{ steps.extract_version.outputs.version }}-x64.exe + # asset_content_type: application/octet-stream npm-publish: runs-on: GH-hosted-ubuntu @@ -324,6 +319,11 @@ jobs: with: go-version: '1.18' + - name: Install Linux Deps + run: | + sudo apt-get update + sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf protobuf-compiler cmake + - name: Install deps run: yarn install @@ -343,6 +343,11 @@ jobs: echo "NPM_TAG=latest" >> $GITHUB_ENV fi + - name: Change Package Visibility to Public + run: | + cd core + sed -i 's/"private": true/"private": false/' package.json + - name: Publish core uses: JS-DevTools/npm-publish@v1 with: @@ -378,7 +383,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions-rs/toolchain@v1 with: - toolchain: 1.71.1 + toolchain: 1.73.0 override: true - name: Install GO @@ -386,6 +391,11 @@ jobs: with: go-version: '1.18' + - name: Install Linux Deps + run: | + sudo apt-get update + sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf protobuf-compiler cmake + - uses: actions/setup-node@v3 with: node-version: '16.x' diff --git a/CHANGELOG b/CHANGELOG index 0bb498c63..69c4e57e8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -15,6 +15,19 @@ This project _loosely_ adheres to [Semantic Versioning](https://semver.org/spec/ ### Fixed +## [0.7.1] - 20/10/2023 + +### Added + +### Changed + +### Deprecated + +### Removed + +### Fixed + - Fix CI release workflows + ## [0.7.0] - 20/10/2023 ### Added diff --git a/Cargo.lock b/Cargo.lock index 437e00c30..32e43845d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14,7 +14,7 @@ dependencies = [ [[package]] name = "ad4m" -version = "0.7.0" +version = "0.7.1" dependencies = [ "ad4m-client", "anyhow", @@ -38,7 +38,7 @@ dependencies = [ [[package]] name = "ad4m-client" -version = "0.7.0" +version = "0.7.1" dependencies = [ "anyhow", "async-tungstenite", @@ -62,7 +62,7 @@ dependencies = [ [[package]] name = "ad4m-launcher" -version = "0.7.0" +version = "0.7.1" dependencies = [ "ad4m-client", "chrono", @@ -10202,7 +10202,7 @@ dependencies = [ [[package]] name = "rust-executor" -version = "0.7.0" +version = "0.7.1" dependencies = [ "argon2", "base64 0.21.3", diff --git a/bootstrap-languages/agent-language/package.json b/bootstrap-languages/agent-language/package.json index 035b83fcf..d2985b273 100644 --- a/bootstrap-languages/agent-language/package.json +++ b/bootstrap-languages/agent-language/package.json @@ -1,6 +1,6 @@ { "name": "@perspect3vism/agent-language", - "version": "0.7.0", + "version": "0.7.1", "description": "AD4M Language implementation for Holochain profile DNA", "main": "index.js", "scripts": { diff --git a/bootstrap-languages/centralized-p-diff-sync/package.json b/bootstrap-languages/centralized-p-diff-sync/package.json index c3d48a0a8..7b4713fee 100644 --- a/bootstrap-languages/centralized-p-diff-sync/package.json +++ b/bootstrap-languages/centralized-p-diff-sync/package.json @@ -1,6 +1,6 @@ { "name": "@perspect3vism/centralized-perspective-diff-sync", - "version": "0.6.0", + "version": "0.7.1", "description": "An AD4M language for syncing mutations to a shared perspective via a centralized server", "main": "index.js", "scripts": { diff --git a/bootstrap-languages/direct-message-language/package.json b/bootstrap-languages/direct-message-language/package.json index 58d4a120c..0c25c4ffc 100644 --- a/bootstrap-languages/direct-message-language/package.json +++ b/bootstrap-languages/direct-message-language/package.json @@ -1,6 +1,6 @@ { "name": "@perspect3vism/direct-message-language", - "version": "0.7.0", + "version": "0.7.1", "description": "A templateable AD4M Language for personal, per-agent direct message Languages", "main": "index.js", "type": "module", diff --git a/bootstrap-languages/neighbourhood-language/package.json b/bootstrap-languages/neighbourhood-language/package.json index 7abde9762..7ab4255ba 100644 --- a/bootstrap-languages/neighbourhood-language/package.json +++ b/bootstrap-languages/neighbourhood-language/package.json @@ -1,6 +1,6 @@ { "name": "@perspect3vism/neighbourhood-language", - "version": "0.7.0", + "version": "0.7.1", "description": "This is a Language for storing AD4M neighbourhood objects", "main": "index.js", "scripts": { diff --git a/bootstrap-languages/p-diff-sync-socket-signaling/package.json b/bootstrap-languages/p-diff-sync-socket-signaling/package.json index b615f2717..dae29a200 100644 --- a/bootstrap-languages/p-diff-sync-socket-signaling/package.json +++ b/bootstrap-languages/p-diff-sync-socket-signaling/package.json @@ -1,6 +1,6 @@ { "name": "@perspect3vism/perspective-diff-sync-socket-signaling", - "version": "0.6.0", + "version": "0.7.1", "description": "An AD4M language for syncing mutations to a share perspective", "main": "index.js", "scripts": { diff --git a/bootstrap-languages/p-diff-sync/package.json b/bootstrap-languages/p-diff-sync/package.json index 20474f482..44c51ae5e 100644 --- a/bootstrap-languages/p-diff-sync/package.json +++ b/bootstrap-languages/p-diff-sync/package.json @@ -1,6 +1,6 @@ { "name": "@perspect3vism/perspective-diff-sync", - "version": "0.7.0", + "version": "0.7.1", "description": "An AD4M language for syncing mutations to a share perspective", "main": "index.js", "scripts": { diff --git a/bootstrap-languages/perspective-language/package.json b/bootstrap-languages/perspective-language/package.json index 02036f9ca..c46a61bc6 100644 --- a/bootstrap-languages/perspective-language/package.json +++ b/bootstrap-languages/perspective-language/package.json @@ -1,6 +1,6 @@ { "name": "@perspect3vism/perspective-language", - "version": "0.7.0", + "version": "0.7.1", "description": "An AD4M Language for perspective snapshot expressions stored on IPFS", "main": "index.js", "scripts": { diff --git a/cli/Cargo.toml b/cli/Cargo.toml index e15fc4d22..a4d0e125b 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,6 +1,8 @@ [package] name = "ad4m" -version = "0.7.0" + +version = "0.7.1" + edition = "2021" authors = ["Nicolas Luck "] description = "A command-line interface to AD4M (i.e. the AD4M executor) - https://ad4m.dev" @@ -12,6 +14,8 @@ documentation = "https://docs.ad4m.dev" readme = "README.md" [dependencies] + + ad4m-client = { path = "../rust-client"} rust-executor = { path = "../rust-executor" } anyhow = "1.0.65" diff --git a/connect/package.json b/connect/package.json index d7d405170..3c8bacc3c 100644 --- a/connect/package.json +++ b/connect/package.json @@ -1,6 +1,6 @@ { "name": "@perspect3vism/ad4m-connect", - "version": "0.7.0", + "version": "0.7.1", "description": "Lib for handling everything needed to setup a connection to a local or remote ad4m-executor", "license": "CAL-1.0", "main": "dist/web.js", diff --git a/core/package.json b/core/package.json index 7b725067c..ffeb7aee5 100644 --- a/core/package.json +++ b/core/package.json @@ -1,11 +1,12 @@ { "name": "@perspect3vism/ad4m", - "version": "0.7.0", + "version": "0.7.1", "description": "*The Agent-Centric Distributed Application Meta-ontology* or just: *Agent-Centric DApp Meta-ontology* * A new meta-ontology for interoperable, decentralized application design * A spanning-layer to enable seamless integration between Holochain DNAs, blockchains, linked-data structures/ontologies and centralized back-ends * The basis for turning distinct, monolithic and siloed apps into a global, open and interoperable sense-making network", "main": "lib/index.cjs", "module": "lib/index.js", "types": "lib/src/index.d.ts", "type": "module", + "private": true, "scripts": { "build": "patch-package && tsc && yarn run buildSchema && yarn run bundle", "buildSchema": "node --es-module-specifier-resolution=node lib/src/buildSchema.js", diff --git a/core/shims/type-graphql.ts b/core/shims/type-graphql.ts index f6de0621a..a75b9c269 100644 --- a/core/shims/type-graphql.ts +++ b/core/shims/type-graphql.ts @@ -34,6 +34,7 @@ ``` */ + import * as src from "../node_modules/type-graphql/dist/index.js"; export const dummyValue = ""; diff --git a/docs/package.json b/docs/package.json index f7eb239eb..db894af79 100644 --- a/docs/package.json +++ b/docs/package.json @@ -1,6 +1,6 @@ { "name": "@perspect3vism/ad4m-docs", - "version": "0.7.0", + "version": "0.7.1", "description": "Documentation for AD4M", "license": "CAL-1.0", "homepage": "./", diff --git a/executor/package.json b/executor/package.json index 9c915a77f..2d98bb30c 100644 --- a/executor/package.json +++ b/executor/package.json @@ -1,6 +1,6 @@ { "name": "@perspect3vism/ad4m-executor", - "version": "0.7.0", + "version": "0.7.1", "description": "Node.js package that allows the running/interfacing of AD4M Languages & Perspectives.", "main": "lib/main.js", "files": [ diff --git a/executor/src/core/Config.ts b/executor/src/core/Config.ts index 2f31099f9..f8da0ca38 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 '@perspect3vism/ad4m'; -export let ad4mExecutorVersion = "0.7.0"; +export let ad4mExecutorVersion = "0.7.1"; export let agentLanguageAlias = "did"; export let languageLanguageAlias = "lang"; export let neighbourhoodLanguageAlias = "neighbourhood"; diff --git a/package.json b/package.json index 31a26fe86..63038d74a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ad4m-monorepo", - "version": "0.7.0", + "version": "0.7.1", "workspaces": [ "core", "docs", diff --git a/rust-client/Cargo.toml b/rust-client/Cargo.toml index 755ba6aab..c2d89c03f 100644 --- a/rust-client/Cargo.toml +++ b/rust-client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ad4m-client" -version = "0.7.0" +version = "0.7.1" 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 afcb05c51..854505087 100644 --- a/rust-executor/Cargo.toml +++ b/rust-executor/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rust-executor" -version = "0.7.0" +version = "0.7.1" edition = "2021" authors = ["Nicolas Luck "] description = "A command-line interface to AD4M (i.e. the AD4M executor) - https://ad4m.dev" diff --git a/rust-executor/package.json b/rust-executor/package.json index 4911d074a..02b768ace 100644 --- a/rust-executor/package.json +++ b/rust-executor/package.json @@ -1,6 +1,6 @@ { "name": "@perspect3vism/rust-ad4m-executor", - "version": "0.7.0", + "version": "0.7.1", "description": "Rust built version of the ad4m-executor, exposing GraphQL methods for AD4M", "main": "", "files": [], diff --git a/rust-executor/src/globals.rs b/rust-executor/src/globals.rs index 8f13e0f51..290cf573e 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.7.0"); + pub static ref AD4M_VERSION: String = String::from("0.7.1"); } /// 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 5f3a116f5..8304a6e2d 100644 --- a/test-runner/package.json +++ b/test-runner/package.json @@ -1,6 +1,6 @@ { "name": "@perspect3vism/ad4m-test", - "version": "0.7.0", + "version": "0.7.1", "description": "Testing library to test ad4m languages", "license": "MIT", "bin": "./build/cli.js", diff --git a/tests/js/package.json b/tests/js/package.json index 94b0acaaa..e472c8d31 100644 --- a/tests/js/package.json +++ b/tests/js/package.json @@ -1,6 +1,6 @@ { "name": "@perspect3vism/ad4m-integration-tests", - "version": "0.7.0", + "version": "0.7.1", "description": "Node.js package that allows the running/interfacing of AD4M Languages & Perspectives.", "type": "module", "scripts": { diff --git a/ui/package.json b/ui/package.json index 98813e83c..faad108b6 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "ad4m-launcher", - "version": "0.7.0", + "version": "0.7.1", "private": true, "type": "module", "dependencies": { @@ -28,7 +28,11 @@ "tauri": "tauri", "eject": "vite eject", "build": "vite build", - "package-ad4m": "yarn run build && yarn tauri 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 && yarn run build && yarn tauri build --verbose && powershell -ExecutionPolicy Bypass -File ./scripts/reverse-patch-prerelease-tags.ps1", + "package-ad4m:macos": "yarn run build && yarn tauri build --verbose", + "package-ad4m:linux": "yarn run build && ./scripts/patch-safe-buffer.sh && yarn tauri build --verbose && ./scripts/reverse-patch-safe-buffer.sh" }, "eslintConfig": { "extends": [ @@ -62,7 +66,8 @@ "customize-cra": "1.0.0", "react-app-rewired": "^2.2.1", "react-error-overlay": "6.0.9", - "vite": "^4.0.1" + "vite": "^4.0.1", + "run-script-os": "^1.1.6" }, "resolutions": { "react-error-overlay": "6.0.9" diff --git a/ui/scripts/patch-prerelease-tags.ps1 b/ui/scripts/patch-prerelease-tags.ps1 new file mode 100644 index 000000000..76de559ff --- /dev/null +++ b/ui/scripts/patch-prerelease-tags.ps1 @@ -0,0 +1,5 @@ +(Get-Content -Path 'package.json' -Raw) -replace '"version": "(.*)-prerelease",', '"version": "$1",' | Set-Content -Path 'package.json' + +(Get-Content -Path 'src-tauri/tauri.conf.json' -Raw) -replace '"version": "(.*)-prerelease"', '"version": "$1"' | Set-Content -Path 'src-tauri/tauri.conf.json' + +(Get-Content -Path 'src-tauri/Cargo.toml' -Raw) -replace 'version = "(.*)-prerelease\.0"', 'version = "$1"' | Set-Content -Path 'src-tauri/Cargo.toml' diff --git a/ui/scripts/patch-safe-buffer.sh b/ui/scripts/patch-safe-buffer.sh new file mode 100755 index 000000000..dc324640c --- /dev/null +++ b/ui/scripts/patch-safe-buffer.sh @@ -0,0 +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');/" ../node_modules/safer-buffer/safer.js diff --git a/ui/scripts/reverse-patch-prerelease-tags.ps1 b/ui/scripts/reverse-patch-prerelease-tags.ps1 new file mode 100644 index 000000000..c51fe56d9 --- /dev/null +++ b/ui/scripts/reverse-patch-prerelease-tags.ps1 @@ -0,0 +1,5 @@ +(Get-Content -Path 'package.json' -Raw) -replace '"version": "(.*)",', '"version": "$1-prerelease",' | Set-Content -Path 'package.json' + +(Get-Content -Path 'src-tauri/tauri.conf.json' -Raw) -replace '"version": "(.*)",', '"version": "$1-prerelease",' | Set-Content -Path 'src-tauri/tauri.conf.json' + +(Get-Content -Path 'src-tauri/Cargo.toml' -Raw) -replace 'version = "(.*)"', 'version = "$1-prerelease.0"' | Set-Content -Path 'src-tauri/Cargo.toml' diff --git a/ui/scripts/reverse-patch-safe-buffer.sh b/ui/scripts/reverse-patch-safe-buffer.sh new file mode 100755 index 000000000..79ecc795a --- /dev/null +++ b/ui/scripts/reverse-patch-safe-buffer.sh @@ -0,0 +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';/" ../node_modules/safer-buffer/safer.js \ No newline at end of file diff --git a/ui/src-tauri/Cargo.toml b/ui/src-tauri/Cargo.toml index 214002e10..8948f54fd 100644 --- a/ui/src-tauri/Cargo.toml +++ b/ui/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ad4m-launcher" -version = "0.7.0" +version = "0.7.1" description = "Administration of ad4m services" authors = ["Kaichao Sun"] license = "" @@ -51,3 +51,7 @@ dev = [] # this feature is used used for production builds where `devPath` points to the filesystem # DO NOT remove this custom-protocol = [ "tauri/custom-protocol"] + + + + diff --git a/ui/src-tauri/tauri.conf.json b/ui/src-tauri/tauri.conf.json index 6508971af..675993760 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.7.0" + "version": "0.7.1" }, "build": { "distDir": "../dist",