Merge pull request #410 from coasys/windows-working

Ad4m launcher now works on windows
coasys · Oct 19, 2023 · 33c1402 · 33c1402
2 parents d7267b1 + 98e6518
commit 33c1402
Show file tree

Hide file tree

Showing 73 changed files with 4,303 additions and 3,505 deletions.
diff --git a/.github/workflows/integration_cli.yml b/.github/workflows/integration_cli.yml
@@ -28,6 +28,9 @@ jobs:
         override: true
         toolchain: 1.71.1
 
+    - name: Install protobuf & cmake
+      run: brew install protobuf cmake
+
     - name: Cache cargo
       id: cache-cargo
       uses: actions/cache@v3

diff --git a/.github/workflows/integration_js.yml b/.github/workflows/integration_js.yml
@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        platform: [ubuntu-22.04]
+        platform: [GH-hosted-ubuntu]
         node-version: [16.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
@@ -60,7 +60,7 @@ jobs:
     - name: install system dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
+        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"
@@ -80,11 +80,14 @@ jobs:
           ~/.cargo/registry/cache/
           ~/.cargo/git/db/
           target/
-        key: $${{ runner.os }}-cargo-${{ hashFiles('./Cargo.lock') }}
+        key: ${{ runner.os }}-cargo-${{ hashFiles('./Cargo.lock') }}
 
     - name: Run the tests
       run: yarn test
 
+    # - name: Run integration tests
+    #   run: cd ./tests/js && yarn run test-main
+
   # test-windows:
   #   name: JS Ad4mClient <> AD4M Executor - Windows
   #   runs-on: windows-2019

diff --git a/.github/workflows/p-diff-sync-tests.yml b/.github/workflows/p-diff-sync-tests.yml
@@ -316,48 +316,48 @@ jobs:
     - run: yarn run build-languages
     - run: cd bootstrap-languages/p-diff-sync/hc-dna/zomes/tests && yarn install && yarn run test-telepresence
 
-  integration:
-    name: Integration Test
+  # integration:
+  #   name: Integration Test
 
-    strategy:
-      matrix:
-        platform: [ubuntu-22.04]
-        node-version: [16.x]
-        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
-
-    runs-on: ${{ matrix.platform }}
-
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions-rs/toolchain@v1
-      with:
-        toolchain: 1.71.1
-
-    - name: Cache cargo
-      id: cache-cargo
-      uses: actions/cache@v3
-      with:
-        path: |
-          ~/.cargo/bin/
-          ~/.cargo/registry/index/
-          ~/.cargo/registry/cache/
-          ~/.cargo/git/db/
-          target/
-        key: ${{ runner.os }}-cargo
-
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v2
-      with:
-        node-version: ${{ matrix.node-version }}
-        cache: 'npm'
-
-    - name: Install Deno
-      uses: denoland/setup-deno@v1
-      with:
-        deno-version: v1.32.4
-
-    - run: rustup target add wasm32-unknown-unknown
-    - run: yarn install
-    - run: cargo install holochain_cli --version 0.2.2 || echo "hc already installed"
-    - run: yarn run build
-    - run: cd bootstrap-languages/p-diff-sync && yarn run integration-test
+  #   strategy:
+  #     matrix:
+  #       platform: [ubuntu-22.04]
+  #       node-version: [16.x]
+  #       # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+
+  #   runs-on: ${{ matrix.platform }}
+
+  #   steps:
+  #   - uses: actions/checkout@v2
+  #   - uses: actions-rs/toolchain@v1
+  #     with:
+  #       toolchain: 1.71.1
+
+  #   - name: Cache cargo
+  #     id: cache-cargo
+  #     uses: actions/cache@v3
+  #     with:
+  #       path: |
+  #         ~/.cargo/bin/
+  #         ~/.cargo/registry/index/
+  #         ~/.cargo/registry/cache/
+  #         ~/.cargo/git/db/
+  #         target/
+  #       key: ${{ runner.os }}-cargo
+
+  #   - name: Use Node.js ${{ matrix.node-version }}
+  #     uses: actions/setup-node@v2
+  #     with:
+  #       node-version: ${{ matrix.node-version }}
+  #       cache: 'npm'
+
+  #   - name: Install Deno
+  #     uses: denoland/setup-deno@v1
+  #     with:
+  #       deno-version: v1.32.4
+
+  #   - run: rustup target add wasm32-unknown-unknown
+  #   - run: yarn install
+  #   - run: cargo install holochain_cli --version 0.2.2 || echo "hc already installed"
+  #   - run: yarn run build
+  #   - run: cd bootstrap-languages/p-diff-sync && yarn run integration-test
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   create-release:
-    runs-on: ubuntu-22.04
+    runs-on: GH-hosted-ubuntu
     outputs:
       upload_url: ${{ steps.create-release.outputs.upload_url }}
 
@@ -42,7 +42,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [ubuntu-22.04, macos-latest, windows-latest]
+        platform: [GH-hosted-ubuntu, macos-latest, windows-latest]
         node-version: [18.17.0]
 
     needs:
@@ -73,10 +73,18 @@ jobs:
     - run: rustup target add wasm32-unknown-unknown
 
     - name: install dependencies (ubuntu only)
-      if: matrix.platform == 'ubuntu-22.04'
+      if: matrix.platform == 'GH-hosted-ubuntu'
       run: |
         sudo apt-get update
-        sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
+        sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf protobuf-compiler cmake
+
+    - name: install dependencies (macos only)
+      if: matrix.platform == 'macos-latest'
+      run: brew install protobuf cmake
+
+    - name: install dependencies (windows only)
+      if: matrix.platform == 'windows-latest'
+      run: choco install protoc cmake
 
     - name: get version
       run: echo "PACKAGE_VERSION=$(node -p "require('./ui/package.json').version")" >> $GITHUB_ENV
@@ -117,7 +125,7 @@ jobs:
 
     - name: Upload Release Deb Asset
       id: upload-release-deb-asset
-      if: matrix.platform == 'ubuntu-22.04'
+      if: matrix.platform == 'GH-hosted-ubuntu'
       uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -129,7 +137,7 @@ jobs:
 
     - name: Upload Release AppImage Asset
       id: upload-release-appimage-asset
-      if: matrix.platform == 'ubuntu-22.04'
+      if: matrix.platform == 'GH-hosted-ubuntu'
       uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -141,7 +149,7 @@ jobs:
 
     - name: Upload Release AppImage Update Asset
       id: upload-release-appimage-asset-update
-      if: matrix.platform == 'ubuntu-latest'
+      if: matrix.platform == 'GH-hosted-ubuntu'
       uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -153,7 +161,7 @@ jobs:
 
     - name: Upload Release AppImage update sig Asset
       id: upload-release-appimage-asset-update-sig
-      if: matrix.platform == 'ubuntu-latest'
+      if: matrix.platform == 'GH-hosted-ubuntu'
       uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -165,7 +173,7 @@ jobs:
 
     - name: Upload Release AD4M CLI Linux Binary
       id: upload-release-linux-ad4m-cli-binary
-      if: matrix.platform == 'ubuntu-22.04'
+      if: matrix.platform == 'GH-hosted-ubuntu'
       uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -272,7 +280,7 @@ jobs:
         asset_content_type: application/octet-stream
 
   npm-publish:
-    runs-on: ubuntu-22.04
+    runs-on: GH-hosted-ubuntu
     steps:
       - uses: actions/checkout@v3
       # Setup .npmrc file to publish to npm
@@ -322,7 +330,7 @@ jobs:
 
 
   crates-publish:
-    runs-on: ubuntu-22.04
+    runs-on: GH-hosted-ubuntu
     steps:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1

diff --git a/.github/workflows/publish_staging.yml b/.github/workflows/publish_staging.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   create-release:
-    runs-on: ubuntu-22.04
+    runs-on: GH-hosted-ubuntu
     outputs:
       upload_url: ${{ steps.create-release.outputs.upload_url }}
 
@@ -42,7 +42,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [ubuntu-22.04, macos-latest, windows-latest]
+        platform: [GH-hosted-ubuntu, macos-latest, windows-latest]
         node-version: [18.17.0]
 
     needs:
@@ -65,10 +65,18 @@ jobs:
     - run: rustup target add wasm32-unknown-unknown
 
     - name: install dependencies (ubuntu only)
-      if: matrix.platform == 'ubuntu-22.04'
+      if: matrix.platform == 'GH-hosted-ubuntu'
       run: |
         sudo apt-get update
-        sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
+        sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf protobuf-compiler cmake
+
+    - name: install dependencies (macos only)
+      if: matrix.platform == 'macos-latest'
+      run: brew install protobuf cmake
+
+    - name: install dependencies (windows only)
+      if: matrix.platform == 'windows-latest'
+      run: choco install protoc cmake
 
     - name: get version
       run: echo "PACKAGE_VERSION=$(node -p "require('./ui/package.json').version")" >> $GITHUB_ENV
@@ -132,7 +140,7 @@ jobs:
 
     - name: Upload Release Deb Asset
       id: upload-release-deb-asset
-      if: matrix.platform == 'ubuntu-22.04'
+      if: matrix.platform == 'GH-hosted-ubuntu'
       uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -144,7 +152,7 @@ jobs:
 
     - name: Upload Release AppImage Asset
       id: upload-release-appimage-asset
-      if: matrix.platform == 'ubuntu-22.04'
+      if: matrix.platform == 'GH-hosted-ubuntu'
       uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -156,7 +164,7 @@ jobs:
 
     - name: Upload Release AppImage Update Asset
       id: upload-release-appimage-asset-update
-      if: matrix.platform == 'ubuntu-latest'
+      if: matrix.platform == 'GH-hosted-ubuntu'
       uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -168,7 +176,7 @@ jobs:
 
     - name: Upload Release AppImage update sig Asset
       id: upload-release-appimage-asset-update-sig
-      if: matrix.platform == 'ubuntu-latest'
+      if: matrix.platform == 'GH-hosted-ubuntu'
       uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -180,7 +188,7 @@ jobs:
 
     - name: Upload Release AD4M CLI Linux Binary
       id: upload-release-linux-ad4m-cli-binary
-      if: matrix.platform == 'ubuntu-22.04'
+      if: matrix.platform == 'GH-hosted-ubuntu'
       uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -287,7 +295,7 @@ jobs:
         asset_content_type: application/octet-stream
 
   npm-publish:
-    runs-on: ubuntu-22.04
+    runs-on: GH-hosted-ubuntu
     steps:
       - uses: actions/checkout@v3
       # Setup .npmrc file to publish to npm
@@ -365,7 +373,7 @@ jobs:
 
 
   crates-publish:
-    runs-on: ubuntu-22.04
+    runs-on: GH-hosted-ubuntu
     steps:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1