Fix building beta installer

whitequill · Feb 8, 2021 · cd49cb1 · cd49cb1
1 parent 7efcf2a
commit cd49cb1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/official-build.yml b/.github/workflows/official-build.yml
@@ -40,6 +40,6 @@ jobs:
       - name: Upload installer
         uses: actions/upload-artifact@v2
         with:
-          name: installer
+          name: Rainmeter-${{ github.event.inputs.version }}-${{ github.event.inputs.type }}
           path: Build/Rainmeter-*.exe
           if-no-files-found: error
diff --git a/Build/Build.bat b/Build/Build.bat
@@ -142,7 +142,7 @@ if not "%CERTFILE%" == "" (
 echo * Building installer
 
 set INSTALLER_PATH=Rainmeter-%VERSION_SHORT%.exe
-if "%ISBETA%" == "true" set INSTALLER_PATH=Rainmeter-%VERSION_SHORT%-r%VERSION_REVISION%-beta.exe
+if "%BUILD_TYPE%" == "beta" set INSTALLER_PATH=Rainmeter-%VERSION_SHORT%-r%VERSION_REVISION%-beta.exe
 
 set INSTALLER_DEFINES=^
 	/DOUTFILE="%INSTALLER_PATH%"^
@@ -151,7 +151,7 @@ set INSTALLER_DEFINES=^
 	/DVERSION_REVISION="%VERSION_REVISION%"^
 	/DVERSION_MAJOR="%VERSION_MAJOR%"^
 	/DVERSION_MINOR="%VERSION_MINOR%"
-if "%ISBETA%" == "true" set INSTALLER_DEFINES=!INSTALLER_DEFINES! /DBETA
+if "%BUILD_TYPE%" == "beta" set INSTALLER_DEFINES=!INSTALLER_DEFINES! /DBETA
 
 "%MAKENSIS%" %INSTALLER_DEFINES% /WX .\Installer\Installer.nsi || (echo   ERROR %ERRORLEVEL%: Building installer failed & exit /b 1)