Merge pull request #178 from Orange-OpenSource/feature/fix-win64-zip-…

…package-name normalize win64 packages names
Orange-OpenSource · Mar 4, 2021 · fc0963b · fc0963b
2 parents 902ce4f + e7f0a46
commit fc0963b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -108,7 +108,7 @@ jobs:
         # create zip
         $hurl_package_version = Get-Content .\target\win-package\version.txt
         cd .\target\win-package
-        Get-ChildItem -Path *.dll, *hurl.exe, *.txt | Compress-Archive -DestinationPath hurl_${hurl_package_version}_win64.zip
+        Get-ChildItem -Path *.dll, *hurl.exe, *.txt | Compress-Archive -DestinationPath hurl-${hurl_package_version}-win64.zip
         Get-ChildItem .\*win64.zip
         cd ..\..
         # create installer
@@ -122,5 +122,5 @@ jobs:
       with:
         name: release-win64-artifacts
         path: |
-          .\target\win-package\hurl_*_installer.exe
-          .\target\win-package\hurl_*_win64.zip
+          .\target\win-package\hurl-*-installer.exe
+          .\target\win-package\hurl-*-win64.zip
diff --git a/ci/windows/hurl.nsi b/ci/windows/hurl.nsi
@@ -15,7 +15,7 @@ Name "hurl ${VERSION}"
 
 ; The file to write
 
-OutFile "hurl_${VERSION}_installer.exe"
+OutFile "hurl-${VERSION}-win64-installer.exe"
 
 ; Request application privileges for Windows Vista and higher
 RequestExecutionLevel admin

diff --git a/contrib/windows/cmd_build.md b/contrib/windows/cmd_build.md
@@ -108,7 +108,7 @@ hurl.exe --version | cut -d" " -f2 > c:\hurl\target\win-package\version.txt
 ```cmd
 set /P hurl_package_version=<c:\hurl\target\win-package\version.txt
 cd c:\hurl\target\win-package
-7z.exe a -y hurl_%hurl_package_version%_win64.zip *.dll *hurl.exe *.txt
+7z.exe a -y hurl_%hurl-package-version%-win64.zip *.dll *hurl.exe *.txt
 ```
 
 ## Create a real package installer for win64

diff --git a/contrib/windows/powershell_build.md b/contrib/windows/powershell_build.md
@@ -118,7 +118,7 @@ cd c:\hurl\integration
 ```powershell
 $hurl_package_version = Get-Content c:\hurl\target\win-package\version.txt
 cd c:\hurl\target\win-package
-Get-ChildItem -Path *.dll, *hurl.exe, *.txt | Compress-Archive -DestinationPath hurl_${hurl_package_version}_win64.zip
+Get-ChildItem -Path *.dll, *hurl.exe, *.txt | Compress-Archive -DestinationPath hurl-${hurl_package_version}-win64.zip
 ```
 
 ## Create a real package installer for win64