[BugFix] Update openssl in cargo.toml and Remove dll and dylibs From Repo (#7478)

* update openssl in cargo.toml, and remove dll and dylibs from repo

* cargo fmt

* cargo clippy

* cargo fmt again

* unused-mut

* adjust build.rs for test container

* windows runner setup

* fix masos linking

* same treatment for sbom files
This commit is contained in:
Danglewood
2026-04-23 14:46:03 -07:00
committed by GitHub
parent ef0b9cfc80
commit a08d5d75d0
27 changed files with 596 additions and 57991 deletions

View File

@@ -27,6 +27,9 @@ jobs:
- name: Checkout
uses: actions/checkout@v6
- name: Install OpenSSL 3
run: brew install openssl@3
- name: Import Code Signing Certificate
uses: apple-actions/import-codesign-certs@fe74d46e82474f87e1ba79832ad28a4013d0e33a # v6
env:
@@ -66,6 +69,7 @@ jobs:
- name: install Rust stable
uses: dtolnay/rust-toolchain@3c5f7ea28cd621ae0bf5283f0e981fb97b8a7af9 # master
with:
toolchain: "stable"
targets: "x86_64-apple-darwin"
- name: Install Modules

View File

@@ -27,6 +27,9 @@ jobs:
- name: Checkout
uses: actions/checkout@v6
- name: Install OpenSSL 3
run: brew install openssl@3
- name: Import Code Signing Certificate
uses: apple-actions/import-codesign-certs@fe74d46e82474f87e1ba79832ad28a4013d0e33a # v6
env:

View File

@@ -58,14 +58,22 @@ jobs:
echo "OPENSSL_INCLUDE_DIR=${{ env.VCPKG_ROOT }}/installed/x64-windows/include" >> $GITHUB_ENV
echo "OPENSSL_LIB_DIR=${{ env.VCPKG_ROOT }}/installed/x64-windows/lib" >> $GITHUB_ENV
- name: Copy SSL DLLs
- name: Set up Node.js
uses: actions/setup-node@v6
with:
node-version: lts/*
- name: Install frontend dependencies
run: npm install
- name: Copy OpenSSL DLLs from vcpkg
run: npm run openssl:copy
- name: Verify OpenSSL DLLs present
shell: pwsh
run: |
# Verify OpenSSL DLLs exist
$opensslBinDir = "${{ env.VCPKG_ROOT }}/installed/x64-windows/bin"
$libcryptoPath = Join-Path $opensslBinDir "libcrypto-3-x64.dll"
$libsslPath = Join-Path $opensslBinDir "libssl-3-x64.dll"
$libcryptoPath = "${{ github.workspace }}/desktop/src-tauri/libcrypto-3-x64.dll"
$libsslPath = "${{ github.workspace }}/desktop/src-tauri/libssl-3-x64.dll"
if (-not (Test-Path $libcryptoPath)) {
Write-Error "Error: libcrypto-3-x64.dll not found at $libcryptoPath"
exit 1
@@ -74,12 +82,8 @@ jobs:
Write-Error "Error: libssl-3-x64.dll not found at $libsslPath"
exit 1
}
# Copy DLLs to src-tauri folder
Copy-Item -Path $libcryptoPath -Destination "src-tauri/" -Force
Copy-Item -Path $libsslPath -Destination "src-tauri/" -Force
Write-Host "Successfully copied OpenSSL DLLs to src-tauri/"
Get-ChildItem -Path "src-tauri/"
Write-Host "OpenSSL DLLs staged in src-tauri/"
Get-ChildItem -Path "${{ github.workspace }}/desktop/src-tauri/*.dll"
- name: Create temp directory for signing DLLs
shell: pwsh
@@ -117,16 +121,14 @@ jobs:
Write-Host "Successfully replaced unsigned DLLs with signed versions"
Get-ChildItem -Path "${{ github.workspace }}/desktop/src-tauri/*.dll"
- name: Set up Node.js
uses: actions/setup-node@v6
with:
node-version: lts/*
- name: Install cyclonedx-npm
run: npm install -g @cyclonedx/cyclonedx-npm
- name: Set up Rust
uses: dtolnay/rust-toolchain@3c5f7ea28cd621ae0bf5283f0e981fb97b8a7af9 # master
with:
toolchain: stable
- name: Cache cargo registry
uses: actions/cache@v5
@@ -146,10 +148,8 @@ jobs:
restore-keys: |
windows-x64-cargo-build-
- name: Install Modules
run: |
npm install
cyclonedx-npm --output-format XML --gather-license-texts --output-file src-tauri/open-data-platform-SBOM-npm.cdx.xml
- name: Generate npm SBOM
run: cyclonedx-npm --output-format XML --gather-license-texts --output-file src-tauri/open-data-platform-SBOM-npm.cdx.xml
- name: Install cargo-cyclonedx
shell: pwsh
@@ -172,6 +172,7 @@ jobs:
run: npm run tauri build -- --target x86_64-pc-windows-msvc --no-bundle
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
OPENSSL_COPY_SKIP_EXISTING: "1"
- name: Create backup of unsigned executable
shell: pwsh
@@ -205,6 +206,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
OPENSSL_COPY_SKIP_EXISTING: "1"
- name: Get Installer Path
id: get_installer_path

View File

@@ -22,6 +22,9 @@ jobs:
steps:
- uses: actions/checkout@v6
- name: Install OpenSSL 3
run: brew install openssl@3
- name: Set up Node.js
uses: actions/setup-node@v6
with:

View File

@@ -22,6 +22,9 @@ jobs:
steps:
- uses: actions/checkout@v6
- name: Install OpenSSL 3
run: brew install openssl@3
- name: Set up Node.js
uses: actions/setup-node@v6
with:

View File

@@ -43,16 +43,16 @@ jobs:
- name: Install OpenSSL using vcpkg
working-directory: ${{ github.workspace }}
run: ${{ env.VCPKG_ROOT }}/vcpkg install openssl:x64-windows-static --vcpkg-root ${{ env.VCPKG_ROOT }}
run: ${{ env.VCPKG_ROOT }}/vcpkg install openssl:x64-windows --vcpkg-root ${{ env.VCPKG_ROOT }}
env:
VCPKG_DEFAULT_TRIPLET: x64-windows-static
VCPKG_DEFAULT_TRIPLET: x64-windows
- name: Set OpenSSL env
shell: bash
run: |
echo "OPENSSL_DIR=${{ env.VCPKG_ROOT }}/installed/x64-windows-static" >> $GITHUB_ENV
echo "OPENSSL_INCLUDE_DIR=${{ env.VCPKG_ROOT }}/installed/x64-windows-static/include" >> $GITHUB_ENV
echo "OPENSSL_LIB_DIR=${{ env.VCPKG_ROOT }}/installed/x64-windows-static/lib" >> $GITHUB_ENV
echo "OPENSSL_DIR=${{ env.VCPKG_ROOT }}/installed/x64-windows" >> $GITHUB_ENV
echo "OPENSSL_INCLUDE_DIR=${{ env.VCPKG_ROOT }}/installed/x64-windows/include" >> $GITHUB_ENV
echo "OPENSSL_LIB_DIR=${{ env.VCPKG_ROOT }}/installed/x64-windows/lib" >> $GITHUB_ENV
- name: Set up Node.js
uses: actions/setup-node@v6

View File

@@ -43,16 +43,16 @@ jobs:
- name: Install OpenSSL using vcpkg
working-directory: ${{ github.workspace }}
run: ${{ env.VCPKG_ROOT }}/vcpkg install openssl:arm64-windows-static --vcpkg-root ${{ env.VCPKG_ROOT }}
run: ${{ env.VCPKG_ROOT }}/vcpkg install openssl:arm64-windows --vcpkg-root ${{ env.VCPKG_ROOT }}
env:
VCPKG_DEFAULT_TRIPLET: arm64-windows-static
VCPKG_DEFAULT_TRIPLET: arm64-windows
- name: Set OpenSSL env
shell: bash
run: |
echo "OPENSSL_DIR=${{ env.VCPKG_ROOT }}/installed/arm64-windows-static" >> $GITHUB_ENV
echo "OPENSSL_INCLUDE_DIR=${{ env.VCPKG_ROOT }}/installed/arm64-windows-static/include" >> $GITHUB_ENV
echo "OPENSSL_LIB_DIR=${{ env.VCPKG_ROOT }}/installed/arm64-windows-static/lib" >> $GITHUB_ENV
echo "OPENSSL_DIR=${{ env.VCPKG_ROOT }}/installed/arm64-windows" >> $GITHUB_ENV
echo "OPENSSL_INCLUDE_DIR=${{ env.VCPKG_ROOT }}/installed/arm64-windows/include" >> $GITHUB_ENV
echo "OPENSSL_LIB_DIR=${{ env.VCPKG_ROOT }}/installed/arm64-windows/lib" >> $GITHUB_ENV
- name: Set up Node.js
uses: actions/setup-node@v6