Merge branch 'dev' into staging

coasys · Jul 31, 2024 · 335efa5 · 335efa5
2 parents 08a73b2 + 802620c
commit 335efa5
Show file tree

Hide file tree

Showing 95 changed files with 7,045 additions and 4,165 deletions.
diff --git a/.circleci/Dockerfile b/.circleci/Dockerfile
@@ -29,6 +29,8 @@ RUN echo 'export PATH="/usr/local/bin:$PATH"' >> $HOME/.bashrc
 # Install Rust
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 RUN echo 'export PATH="$HOME/.cargo/bin:$PATH"' >> /home/circleci/.bashrc
+RUN ~/.cargo/bin/rustup install 1.78
+RUN ~/.cargo/bin/rustup default 1.78
 RUN ~/.cargo/bin/rustup target add wasm32-unknown-unknown
 
 # Install Deno

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -8,13 +8,13 @@ orbs:
 jobs:
   build-and-test:
     docker:
-      - image: coasys/ad4m-ci-linux:latest@sha256:7008f587d355d1adeb58553f52f99e1812822b4d21dc78d69bc96040d5e57e82
+      - image: coasys/ad4m-ci-linux:latest@sha256:1278f700839a43daa0edd31b605c4a73e7f5c54c0d8c7dfbc26b3aa4e2e4ef66
     resource_class: xlarge
     steps:
       - checkout
       - restore_cache:
           keys:
-            - hc-0.3.0-beta-dev-27-v7
+            - hc-0.3.2-rc1
             - hc-
             - rust-cache-{{ checksum "Cargo.lock" }}
             - rust-cache-
@@ -25,7 +25,7 @@ jobs:
             if [ ! -f "$HOME/.cargo/bin/hc" ]; then
               git clone https://github.com/holochain/holochain.git
               cd holochain
-              git checkout holochain-0.3.0-beta-dev.27
+              git checkout holochain-0.3.2-rc.1
               cd crates/hc
               cargo build --release
               pwd
@@ -42,7 +42,7 @@ jobs:
             fi
             echo 'export PATH="$HOME/.cargo/bin:$PATH"' >> $BASH_ENV
       - save_cache:
-          key: hc-0.3.0-beta-dev-27-v7
+          key: hc-0.3.2-rc1
           paths:
             - /home/circleci/.cargo/bin
       - restore_cache:
@@ -96,7 +96,7 @@ jobs:
           at: .
       - restore_cache:
           keys:
-            - hc-0.3.0-beta-dev-27-v7
+            - hc-hc-0.3.2-rc1
             - hc-
       - restore_cache:
           keys:

diff --git 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.76.0
+        toolchain: 1.77.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
@@ -26,7 +26,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions-rs/toolchain@v1
       with:
-        toolchain: 1.76.0
+        toolchain: 1.77.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
@@ -26,7 +26,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions-rs/toolchain@v1
       with:
-        toolchain: 1.76.0
+        toolchain: 1.77.0
 
     - name: Cache cargo
       id: cache-cargo
@@ -73,7 +73,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions-rs/toolchain@v1
       with:
-        toolchain: 1.76.0
+        toolchain: 1.77.0
 
     - name: Cache cargo
       id: cache-cargo

diff --git a/.github/workflows/integration_cli.yml.disabled b/.github/workflows/integration_cli.yml.disabled
@@ -25,7 +25,7 @@ jobs:
       uses: actions-rs/toolchain@v1
       with:
         override: true
-        toolchain: 1.76.0
+        toolchain: 1.77.0
 
     - name: Use Python 3.11
       uses: actions/setup-python@v4

diff --git a/.github/workflows/integration_js.yml.disabled b/.github/workflows/integration_js.yml.disabled
@@ -23,7 +23,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: actions-rs/toolchain@v1
       with:
-        toolchain: 1.76.0
+        toolchain: 1.77.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
@@ -26,7 +26,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions-rs/toolchain@v1
       with:
-        toolchain: 1.76.0
+        toolchain: 1.77.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.76.0
+        toolchain: 1.77.0
     - name: Cache cargo
       id: cache-cargo
       uses: actions/cache@v3
@@ -102,7 +102,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions-rs/toolchain@v1
       with:
-        toolchain: 1.76.0
+        toolchain: 1.77.0
 
     - name: Cache cargo
       id: cache-cargo
@@ -150,7 +150,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions-rs/toolchain@v1
       with:
-        toolchain: 1.76.0
+        toolchain: 1.77.0
 
     - name: Cache cargo
       id: cache-cargo
@@ -198,7 +198,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions-rs/toolchain@v1
       with:
-        toolchain: 1.76.0
+        toolchain: 1.77.0
 
     - name: Cache cargo
       id: cache-cargo
@@ -247,7 +247,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions-rs/toolchain@v1
       with:
-        toolchain: 1.76.0
+        toolchain: 1.77.0
 
     - name: Cache cargo
       id: cache-cargo
@@ -295,7 +295,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions-rs/toolchain@v1
       with:
-        toolchain: 1.76.0
+        toolchain: 1.77.0
 
     - name: Cache cargo
       id: cache-cargo
@@ -343,7 +343,7 @@ jobs:
   #   - uses: actions/checkout@v2
   #   - uses: actions-rs/toolchain@v1
   #     with:
-  #       toolchain: 1.76.0
+  #       toolchain: 1.77.0
 
   #   - name: Cache cargo
   #     id: cache-cargo

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -60,9 +60,15 @@ jobs:
       uses: actions-rs/toolchain@v1
       with:
         override: true
-        toolchain: 1.76.0
+        toolchain: 1.77.0
     - run: rustup target add wasm32-unknown-unknown
 
+    - name: Install Rust targets for macOS
+      if: matrix.platform == 'macos-latest'
+      run: |
+        rustup target add x86_64-apple-darwin
+        rustup target add aarch64-apple-darwin
+
     - name: Install GO
       uses: actions/setup-go@v4
       with:
@@ -129,15 +135,30 @@ jobs:
     - name: Install core dependencies
       run: cd ./core && pnpm install
 
+    - name: Decrypt and install certificates
+      env:
+        APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
+        APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
+      run: |
+        echo $APPLE_CERTIFICATE | base64 --decode > certificate.p12
+        security create-keychain -p "actions" build.keychain
+        security import certificate.p12 -k build.keychain -P "$APPLE_CERTIFICATE_PASSWORD" -T /usr/bin/codesign
+        security list-keychain -d user -s build.keychain
+        security unlock-keychain -p "actions" build.keychain
+        mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
+        security set-key-partition-list -S apple-tool
+
     - name: Build AD4M-CLI & build Launcher binary (macos/linux-latest)
       if: matrix.platform != 'windows-latest'
       env:
         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_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)
@@ -215,7 +236,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/ad4m/target/release/bundle/dmg/ADAM Launcher_${{ steps.extract_version.outputs.version }}_aarch64.dmg"
+        asset_path:  "/Users/runner/work/ad4m/ad4m/target/universal-apple-darwin/release/bundle/dmg/ADAM Launcher_${{ steps.extract_version.outputs.version }}_universal.dmg"
         asset_name: ADAM\ Launcher_${{ steps.extract_version.outputs.version }}_aarch64.dmg
         asset_content_type: application/octet-stream
 
@@ -227,7 +248,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/ad4m/target/release/bundle/macos/ADAM Launcher.app.tar.gz"
+        asset_path:  "/Users/runner/work/ad4m/ad4m/target/release/universal-apple-darwin/bundle/macos/ADAM Launcher.app.tar.gz"
         asset_name: ADAM\ Launcher_${{ steps.extract_version.outputs.version }}_aarch64.app.tar.gz
         asset_content_type: application/octet-stream
 
@@ -239,7 +260,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/ad4m/target/release/bundle/macos/ADAM Launcher.app.tar.gz.sig"
+        asset_path:  "/Users/runner/work/ad4m/ad4m/target/release/universal-apple-darwin/bundle/macos/ADAM Launcher.app.tar.gz.sig"
         asset_name: ADAM\ Launcher_${{ steps.extract_version.outputs.version }}_aarch64.app.tar.gz.sig
         asset_content_type: application/octet-stream
 
@@ -403,7 +424,7 @@ jobs:
      - uses: actions/checkout@v2
      - uses: actions-rs/toolchain@v1
        with:
-         toolchain: 1.76.0
+         toolchain: 1.77.0
          override: true
 
      - name: Install GO

diff --git a/.github/workflows/publish_staging.yml b/.github/workflows/publish_staging.yml
@@ -57,9 +57,15 @@ jobs:
       uses: actions-rs/toolchain@v1
       with:
         override: true
-        toolchain: 1.76.0
+        toolchain: 1.77.0
     - run: rustup target add wasm32-unknown-unknown
 
+    - name: Install Rust targets for macOS
+      if: matrix.platform == 'macos-latest'
+      run: |
+        rustup target add x86_64-apple-darwin
+        rustup target add aarch64-apple-darwin
+
     - name: Install Deno
       uses: denoland/setup-deno@v1
       with:
@@ -126,15 +132,30 @@ jobs:
     - name: Install core dependencies
       run: cd ./core && pnpm install --no-cache
 
+    - name: Decrypt and install certificates
+      env:
+        APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
+        APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
+      run: |
+        echo $APPLE_CERTIFICATE | base64 --decode > certificate.p12
+        security create-keychain -p "actions" build.keychain
+        security import certificate.p12 -k build.keychain -P "$APPLE_CERTIFICATE_PASSWORD" -T /usr/bin/codesign
+        security list-keychain -d user -s build.keychain
+        security unlock-keychain -p "actions" build.keychain
+        mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
+        security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "actions" build.keychain
+
     - name: Build AD4M-CLI & build Launcher binary (macos/linux-latest)
       if: matrix.platform != 'windows-latest'
       env:
         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_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)
@@ -212,7 +233,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/ad4m/target/release/bundle/dmg/ADAM Launcher_${{ steps.extract_version.outputs.version }}_aarch64.dmg"
+        asset_path:  "/Users/runner/work/ad4m/ad4m/target/universal-apple-darwin/release/bundle/dmg/ADAM Launcher_${{ steps.extract_version.outputs.version }}_universal.dmg"
         asset_name: ADAM\ Launcher_${{ steps.extract_version.outputs.version }}_aarch64.dmg
         asset_content_type: application/octet-stream
 
@@ -224,7 +245,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/ad4m/target/release/bundle/macos/ADAM Launcher.app.tar.gz"
+        asset_path:  "/Users/runner/work/ad4m/ad4m/target/universal-apple-darwin/release/bundle/macos/ADAM Launcher.app.tar.gz"
         asset_name: ADAM\ Launcher_${{ steps.extract_version.outputs.version }}_aarch64.app.tar.gz
         asset_content_type: application/octet-stream
 
@@ -236,7 +257,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/ad4m/target/release/bundle/macos/ADAM Launcher.app.tar.gz.sig"
+        asset_path:  "/Users/runner/work/ad4m/ad4m/target/universal-apple-darwin/release/bundle/macos/ADAM Launcher.app.tar.gz.sig"
         asset_name: ADAM\ Launcher_${{ steps.extract_version.outputs.version }}_aarch64.app.tar.gz.sig
         asset_content_type: application/octet-stream
 
@@ -427,7 +448,7 @@ jobs:
      - uses: actions/checkout@v2
      - uses: actions-rs/toolchain@v1
        with:
-         toolchain: 1.76.0
+         toolchain: 1.77.0
          override: true
 
      - name: Install GO

diff --git a/CHANGELOG b/CHANGELOG
@@ -35,6 +35,7 @@ This project _loosely_ adheres to [Semantic Versioning](https://semver.org/spec/
 - Update color, logo & brand for ad4m-connect. [PR#502](https://github.com/coasys/ad4m/pull/502)\
 - Update the verify code header to show "Check Email" if using hosting. [PR#502](https://github.com/coasys/ad4m/pull/502)
 - ad4m.expression.get() handles literal values client-side to avoid roundtrips, can be overridden with optional flag [PR#498](https://github.com/coasys/ad4m/pull/498)
+- Update to Holochain 0.3.2-rc1 [PR#506](https://github.com/coasys/ad4m/pull/506)
 
 ## [0.9.0] - 23/03/2024