feat: Embed webviews in main window instead of forking (#205)

* WIP * Complete webview embedding * Update vcpkg config * Fix Wisp link and jre tests * Delete linux static jobs * Remove libarchive workaround * Try different windows compiler cache * Run toolchain step earlier on windows * Make cargo-vcpkg verbose * Remove vcpkg manifest
atlanticaccent · Nov 28, 2023 · c3b929d · c3b929d
1 parent a2ed6d2
commit c3b929d
Show file tree

Hide file tree

Showing 19 changed files with 1,623 additions and 1,661 deletions.
diff --git a/.github/workflows/linux_static.yml b/.github/workflows/linux_static.yml
diff --git a/.github/workflows/linux_static_debug.yml b/.github/workflows/linux_static_debug.yml
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -21,9 +21,8 @@ jobs:
         run: |
           brew install coreutils
           brew install pkgconfig
-          brew extract --version=3.6.1 libarchive homebrew/cask
-          brew install libarchive@3.6.1
-          echo PKG_CONFIG_PATH=$(brew ls libarchive@3.6.1 | grep .pc$ | sed 's|/libarchive.pc||') >> $GITHUB_ENV
+          brew install libarchive
+          echo PKG_CONFIG_PATH=$(brew ls libarchive | grep .pc$ | sed 's|/libarchive.pc||') >> $GITHUB_ENV
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -19,29 +19,28 @@ jobs:
     env:
       VCPKG_DEFAULT_TRIPLET: x64-windows-static
       VCPKG_ROOT: 'C:\vcpkg'
+      SCCACHE_GHA_ENABLED: "true"
+      RUSTC_WRAPPER: "sccache"
     steps:
       - uses: actions/checkout@v2
 
-      - name: Check cache
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+      - name: Run sccache-cache
+        uses: mozilla-actions/sccache-action@v0.0.3
 
-      - name: Setup vcpkg
-        run: |
-          (cargo install cargo-vcpkg || true)
-          cargo vcpkg build
+      - name: Setup vcpkg cache
+        uses: lukka/run-vcpkg@v11
+        with:
+          vcpkgGitCommitId: 64ca152891d6ab135c6c27881e7eb0ac2fa15bba
 
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
 
+      - name: Setup vcpkg
+        run: |
+          (cargo install cargo-vcpkg || true)
+          cargo vcpkg --verbose build
+
       - uses: actions-rs/cargo@v1
         with:
           command: build