fix(windows): workflow

CCExtractor · May 24, 2024 · 30f7343 · 30f7343
1 parent 39f1455
commit 30f7343
Showing 1 changed file with 21 additions and 22 deletions.
diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
@@ -5,6 +5,7 @@ env:
   VCPKG_DEFAULT_TRIPLET: x64-windows-static
   VCPKG_DEFAULT_BINARY_CACHE: C:\vcpkg\.cache
   VCPKG_COMMIT: fba75d09065fcc76a25dcf386b1d00d33f5175af
+  VCPKG_ROOT: C:\vcpkg
 
 on:
   workflow_dispatch:
@@ -45,7 +46,7 @@ jobs:
           key: vcpkg-${{ runner.os }}-${{ env.VCPKG_COMMIT }}
       - name: Install dependencies
         run: |
-          vcpkg install --x-install-root ${VCPKG_ROOT}/installed
+          vcpkg install --x-install-root ${{ env.VCPKG_ROOT }}/installed
         working-directory: ./windows
       - uses: actions-rs/toolchain@v1
         with:
@@ -59,7 +60,6 @@ jobs:
           LLVM_CONFIG_PATH: "C:\\Program Files\\LLVM\\bin\\llvm-config"
           CARGO_TARGET_DIR: "..\\..\\windows"
           BINDGEN_EXTRA_CLANG_ARGS: -fmsc-version=0
-          VCPKG_ROOT: C:\vcpkg
         run: msbuild ccextractor.sln /p:Configuration=Release-Full /p:Platform=x64
         working-directory: ./windows
       - name: Display version information
@@ -93,30 +93,29 @@ jobs:
           key: vcpkg-${{ runner.os }}-${{ env.VCPKG_COMMIT }}
       - name: Install dependencies
         run: |
-          vcpkg install --x-install-root ${VCPKG_ROOT}/installed
+          vcpkg install --x-install-root ${{ env.VCPKG_ROOT }}/installed
         working-directory: ./windows
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: stable
           override: true
       - name: Install Win 10 SDK
         uses: ilammy/msvc-dev-cmd@v1
-      # - name: build Debug-Full
-      #   env:
-      #     LIBCLANG_PATH: "C:\\Program Files\\LLVM\\lib"
-      #     LLVM_CONFIG_PATH: "C:\\Program Files\\LLVM\\bin\\llvm-config"
-      #     CARGO_TARGET_DIR: "..\\..\\windows"
-      #     BINDGEN_EXTRA_CLANG_ARGS: -fmsc-version=0
-      #     VCPKG_ROOT: C:\vcpkg
-      #   run: msbuild ccextractor.sln /p:Configuration=Debug-Full /p:Platform=x64
-      #   working-directory: ./windows
-      # - name: Display version information
-      #   run: ./ccextractorwinfull.exe --version
-      #   working-directory: ./windows/x64/Debug-Full
-      # - uses: actions/upload-artifact@v4
-      #   with:
-      #     name: CCExtractor Windows Debug build
-      #     path: |
-      #       ./windows/x64/Debug-Full/ccextractorwinfull.exe
-      #       ./windows/x64/Debug-Full/ccextractorwinfull.pdb
-      #       ./windows/x64/Debug-Full/*.dll
+      - name: build Debug-Full
+        env:
+          LIBCLANG_PATH: "C:\\Program Files\\LLVM\\lib"
+          LLVM_CONFIG_PATH: "C:\\Program Files\\LLVM\\bin\\llvm-config"
+          CARGO_TARGET_DIR: "..\\..\\windows"
+          BINDGEN_EXTRA_CLANG_ARGS: -fmsc-version=0
+        run: msbuild ccextractor.sln /p:Configuration=Debug-Full /p:Platform=x64
+        working-directory: ./windows
+      - name: Display version information
+        run: ./ccextractorwinfull.exe --version
+        working-directory: ./windows/x64/Debug-Full
+      - uses: actions/upload-artifact@v4
+        with:
+          name: CCExtractor Windows Debug build
+          path: |
+            ./windows/x64/Debug-Full/ccextractorwinfull.exe
+            ./windows/x64/Debug-Full/ccextractorwinfull.pdb
+            ./windows/x64/Debug-Full/*.dll