fix: openssl install

Author: re2zero

.github/workflows/windows-msvc.yml

@@ -23,7 +23,7 @@ jobs:
             vcredist_file: vc_redist.x64.exe
             artifact_suffix: win64
             cmake_gen: Visual Studio 17 2022
-            vcpkg_triplet: x64-windows
+            vcpkg_triplet: x64-windows-release
           - name: win32_msvc
             os: windows-2022
             build_type: Release
@@ -58,71 +58,31 @@ jobs:
 
       # Install OpenSSL 3.2.6 for both x86 and x64 architectures
       - name: Install OpenSSL ${{ matrix.openssl_arch }}
-        if: steps.cache-openssl.outputs.cache-hit != 'true'
+        shell: pwsh
         run: |
-          choco install openssl --version 3.2.6 --allow-downgrade -y
-        # shell: pwsh
-        # run: |
-        #   $arch = "${{ matrix.openssl_arch }}"
-        #   $version = "3_2_6"
-        #   $opensslUrl = if ($arch -eq "x64") {
-        #     "https://slproweb.com/download/Win64OpenSSL-${version}.msi"
-        #   } else {
-        #     "https://slproweb.com/download/Win32OpenSSL-${version}.msi"
-        #   }
-        #   $installerPath = "$env:TEMP\OpenSSL-${version}_${arch}.msi"
-        #   $installDir = "${{ matrix.openssl_root }}"
-
-        #   Write-Host "Downloading OpenSSL ${version} for ${arch}..."
-        #   Write-Host "URL: $opensslUrl"
-        #   Invoke-WebRequest -Uri $opensslUrl -OutFile $installerPath -UseBasicParsing
-
-        #   Write-Host "Downloaded file size: $(Get-Item $installerPath).Length bytes"
-
-        #   Write-Host "Installing OpenSSL ${version} for ${arch}..."
-        #   Write-Host "Target directory: $installDir"
-
-        #   # Create target directory if it doesn't exist
-        #   if (-not (Test-Path $installDir)) {
-        #     New-Item -ItemType Directory -Path $installDir -Force | Out-Null
-        #     Write-Host "Created directory: $installDir"
-        #   }
-
-        #   $installArgs = @(
-        #     "/i",
-        #     "`"$installerPath`"",
-        #     "/quiet",
-        #     "INSTALLDIR=`"$installDir`"",
-        #     "/norestart",
-        #     "/L*v",  # Enable verbose logging
-        #     "`"$env:TEMP\openssl_install.log`""
-        #   )
-
-        #   Write-Host "Running: msiexec $($installArgs -join ' ')"
-        #   $process = Start-Process msiexec -ArgumentList $installArgs -Wait -PassThru
-
-        #   Write-Host "MSI install exit code: $($process.ExitCode)"
-
-        #   # Wait for installation to complete
-        #   Start-Sleep -Seconds 5
-
-        #   # Check if installation succeeded
-        #   $opensslExe = "$installDir\bin\openssl.exe"
-        #   Write-Host "Checking for OpenSSL at: $opensslExe"
-
-        #   if (Test-Path $opensslExe) {
-        #     Write-Host "✓ OpenSSL installed successfully"
-        #     & $opensslExe version
-        #   } else {
-        #     Write-Host "✗ OpenSSL not found at expected location"
-        #     Write-Host "Listing install directory contents:"
-        #     Get-ChildItem -Path $installDir -Recurse -ErrorAction SilentlyContinue | Select-Object -First 20 FullName
-        #     Write-Host "Install log (last 50 lines):"
-        #     Get-Content "$env:TEMP\openssl_install.log" -Tail 50 -ErrorAction SilentlyContinue
-        #     exit 1
-        #   }
-
-        #   Write-Host "OpenSSL ${version} (${arch}) installation completed"
+          $arch = "${{ matrix.openssl_arch }}"
+          $version = "3_2_6"
+          $opensslUrl = if ($arch -eq "x64") {
+            "https://slproweb.com/download/Win64OpenSSL-${version}.msi"
+          } else {
+            "https://slproweb.com/download/Win32OpenSSL-${version}.msi"
+          }
+          $installerPath = "$env:TEMP\OpenSSL-${version}_${arch}.msi"
+          $installDir = "${{ matrix.openssl_root }}"
+        
+          # 下载安装包
+          Invoke-WebRequest -Uri $opensslUrl -OutFile $installerPath
+
+          # 静默安装到指定目录并等待完成
+          Start-Process msiexec.exe -ArgumentList "/i $installerPath /quiet /qn INSTALLDIR=$installDir"
+
+          # 等待安装完全完成
+          Start-Sleep -Seconds 10
+          
+      - name: Verify OpenSSL installation
+        run: |
+          openssl version
+          echo "OPENSSL_ROOT_DIR is: $env:OPENSSL_ROOT_DIR"
 
 
       - name: Verify OpenSSL cached
@@ -136,8 +96,10 @@ jobs:
         id: cache-qt
         uses: actions/cache@v3
         with:
-          path: ..\Qt
-          key: Windows-QtCache-${{ env.QT_VERSION }}
+          path: ${{ env.HOME }}/Qt
+          key: Windows-${{ matrix.os }}-Qt-${{ env.QT_VERSION }}-${{ matrix.qt_arch }}
+          restore-keys: |
+            Windows-${{ matrix.os }}-Qt-${{ env.QT_VERSION }}-
 
       - name: Install Qt ${{ env.QT_VERSION }}
         uses: jurplel/install-qt-action@v3
@@ -147,28 +109,8 @@ jobs:
           target: ${{ matrix.qt_target }}
           arch: ${{ matrix.qt_arch }}
           # modules: 'qt5compat'
-          # cached: 'false'
           cached: ${{ steps.cache-qt.outputs.cache-hit }}
 
-      - name: '⚙️ Cache vcpkg'
-        id: cache-vcpkg
-        uses: actions/cache@v3
-        with:
-          path: |
-            ${{ github.workspace }}/vcpkg
-            ~/.vcpkg
-          key: Windows-vcpkg-${{ matrix.vcpkg_triplet }}-${{ hashFiles('**/vcpkg.json') }}
-          restore-keys: |
-            Windows-vcpkg-${{ matrix.vcpkg_triplet }}-
-
-      - name: Install vcpkg
-        if: steps.cache-vcpkg.outputs.cache-hit != 'true'
-        shell: pwsh
-        run: |
-          git clone https://github.com/Microsoft/vcpkg.git
-          .\vcpkg\bootstrap-vcpkg.bat -disableMetrics
-          echo "VCPKG_INSTALLED_DIR=$env:GITHUB_WORKSPACE\vcpkg" >> $env:GITHUB_ENV
-
       # Use CMake 3.31.x for better OpenSSL 3.x compatibility while supporting VS 2019
       - name: Setup cmake
         uses: lukka/get-cmake@latest
@@ -182,6 +124,17 @@ jobs:
           path: source
           fetch-depth: 0
 
+      - name: Build and cache vcpkg
+        id: vcpkg
+        uses: johnwason/vcpkg-action@v7
+        with:
+          pkgs: zlib
+          # manifest-dir: ${{ github.workspace }}\source
+          extra-args: --classic --host-triplet=${{matrix.vcpkg_triplet}}
+          triplet: ${{matrix.vcpkg_triplet}}
+          token: ${{ github.token }}
+          revision: master
+
       - name: msvc-build
         id: build
         shell: cmd
@@ -307,11 +260,40 @@ jobs:
           filepath: build/dde-cooperation-setup.iss
 
       - name: Make Installer Directories
+        shell: pwsh
         run: |
-          move build/installer-inno/deepin-cooperation-* build/installer-inno/dde-cooperation/ > NUL
-          powershell -Command "Compress-Archive -Path build/installer-inno/dde-cooperation/* -DestinationPath build/installer-inno/dde-cooperation.zip"
-          move build/installer-inno/deepin-datatransfer-* build/installer-inno/data-transfer/ > NUL
-          powershell -Command "Compress-Archive -Path build/installer-inno/data-transfer/* -DestinationPath build/installer-inno/deepin-data-transfer.zip"
+          $archSuffix = "${{ matrix.artifact_suffix }}"  # win64 or win32
+          $cooperationDir = "build/installer-inno/dde-cooperation-${archSuffix}"
+          $transferDir = "build/installer-inno/data-transfer-${archSuffix}"
+          $cooperationZip = "build/installer-inno/dde-cooperation-${archSuffix}.zip"
+          $transferZip = "build/installer-inno/deepin-data-transfer-${archSuffix}.zip"
+
+          # Move cooperation files
+          if (Test-Path "build/installer-inno/deepin-cooperation-*") {
+            Move-Item -Path "build/installer-inno/deepin-cooperation-*" -Destination $cooperationDir -Force
+            Write-Host "Moved cooperation files to: $cooperationDir"
+          }
+
+          # Move data-transfer files
+          if (Test-Path "build/installer-inno/deepin-datatransfer-*") {
+            Move-Item -Path "build/installer-inno/deepin-datatransfer-*" -Destination $transferDir -Force
+            Write-Host "Moved data-transfer files to: $transferDir"
+          }
+
+          # Create archives
+          if (Test-Path $cooperationDir) {
+            Compress-Archive -Path "$cooperationDir/*" -DestinationPath $cooperationZip -Force
+            Write-Host "Created: $cooperationZip"
+          }
+
+          if (Test-Path $transferDir) {
+            Compress-Archive -Path "$transferDir/*" -DestinationPath $transferZip -Force
+            Write-Host "Created: $transferZip"
+          }
+
+          # List created files
+          Write-Host "Installer archives:"
+          Get-ChildItem -Path "build/installer-inno/*.zip" | Select-Object Name, Length, LastWriteTime
 
       - name: Create Release
         uses: softprops/action-gh-release@v1

cmake/vcpkg.json.in

@@ -4,6 +4,12 @@
   "name": "dde-cooperation",
   "version": "@APP_VERSION@",
   "dependencies": [
-    "zlib"
+    {
+      "name": "zlib"
+    },
+    {
+      "name": "openssl",
+      "version>=": "3.2.6"
+    }
   ]
 }