GH-21: Workflow experiments

negrutiu · Jun 8, 2024 · a32135f · a32135f
1 parent e20685b
commit a32135f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -111,7 +111,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: curl-${{matrix.arch}}
-          path: packages/Release-mingw-${{matrix.arch}}-curl/*
+          path: packages/Release-mingw-${{matrix.arch}}-${{matrix.charset}}-curl/*
 
   package:
     name: Final Package

diff --git a/_build.bat b/_build.bat
@@ -120,7 +120,7 @@ echo.
 
 set bindir=Release-%compiler%-%platform_nsis%-%charset%
 set pkgdir=packages\%configuration%-%compiler%-%platform_nsis%-%charset%
-set curldir=packages\%configuration%-%compiler%-%platform_nsis%-curl
+set curldir=packages\%configuration%-%compiler%-%platform_nsis%-%charset%-curl
 set vcpkginstdir=vcpkg\clone\installed\%triplet%
 
 rmdir /s /q %pkgdir% 2> nul
@@ -144,7 +144,6 @@ call :copy tests\NScurl-Test-build.bat %pkgdir%\Examples\NScurl\
 :end_package
 
 :curl_package
-if /i "%charset%" neq "unicode" goto :end_curl_package
 echo.
 call :copy %vcpkginstdir%\tools\curl\curl.exe %curldir%\
 call :copy src\nscurl\curl-ca-bundle.crt %curldir%\