diff --git a/.github/workflows/windows_build_test_and_push.yml b/.github/workflows/windows_build_test_and_push.yml index c39c39c85..58123b5bf 100644 --- a/.github/workflows/windows_build_test_and_push.yml +++ b/.github/workflows/windows_build_test_and_push.yml @@ -46,23 +46,23 @@ jobs: - name: "Prepare release" run: | cd "C:\Program Files\7-Zip\" - .\7z.exe a $Env:GITHUB_WORKSPACE\Vic2ToHoI4-1.1Spruance-win-x64.zip $Env:GITHUB_WORKSPACE\build\Release\* + .\7z.exe a $Env:GITHUB_WORKSPACE\Vic2ToHoI4-1.2Tito-win-x64.zip $Env:GITHUB_WORKSPACE\build\Release\* - name: "Prepare installer" run: | c:\"Program Files (x86)\Inno Setup 6\iscc" Vic2ToHoI4-Installer.iss - cp $Env:GITHUB_WORKSPACE\Output\Vic2ToHoI4-latest-win-x64.exe $Env:GITHUB_WORKSPACE\Output\Vic2ToHoI4-1.1Spruance-win-x64.exe - - # - name: "Upload binaries to release" - # if: ${{ github.event_name == 'push' }} - # uses: ncipollo/release-action@v1 - # with: - # tag: ${{ steps.previoustag.outputs.tag }} - # allowUpdates: true - # omitBodyDuringUpdate: true - # omitNameDuringUpdate: true - # artifacts: Vic2ToHoI4-1.1Spruance-win-x64.zip, Output\Vic2ToHoI4-1.1Spruance-win-x64.exe - # token: ${{ secrets.API_TOKEN_GITHUB }} + cp $Env:GITHUB_WORKSPACE\Output\Vic2ToHoI4-latest-win-x64.exe $Env:GITHUB_WORKSPACE\Output\Vic2ToHoI4-1.2Tito-win-x64.exe + + - name: "Upload binaries to release" + if: ${{ github.event_name == 'push' }} + uses: ncipollo/release-action@v1 + with: + tag: ${{ steps.previoustag.outputs.tag }} + allowUpdates: true + omitBodyDuringUpdate: true + omitNameDuringUpdate: true + artifacts: Vic2ToHoI4-1.2Tito-win-x64.zip, Output\Vic2ToHoI4-1.2Tito-win-x64.exe + token: ${{ secrets.API_TOKEN_GITHUB }} - name: "Prepare pull request artifact" if: ${{ github.event_name == 'pull_request' }} diff --git a/Vic2ToHoI4-Installer.iss b/Vic2ToHoI4-Installer.iss index 4077c7760..f129a7bcb 100644 --- a/Vic2ToHoI4-Installer.iss +++ b/Vic2ToHoI4-Installer.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "Vic2 to HoI4" -#define MyAppVersion "1.2 TBD" +#define MyAppVersion "1.2 Tito" #define MyAppPublisher "Paradox Game Converters Group" #define MyAppURL "https://paradoxgameconverters.com/" #define MyAppExeName "ConverterFrontend.exe" diff --git a/data/version.txt b/data/version.txt index e442568c0..c4d135e83 100644 --- a/data/version.txt +++ b/data/version.txt @@ -1,7 +1,7 @@ # Version info version = "1.2T" -name = "TBD" +name = "Tito" source = "Vic2" minSource = "3" maxSource = "3" diff --git a/docs/release_checklist.txt b/docs/release_checklist.txt index e1c116ba3..d98e6181c 100644 --- a/docs/release_checklist.txt +++ b/docs/release_checklist.txt @@ -1,11 +1,8 @@ * Add new banner to data/resources/images * Update data/version.txt with new version and name - * Name is currently TBD. Update and remove this line prior to release. * Update Vic2ToHoI4-Installer.iss with new version and name - * Name is currently TBD. Update and remove this line prior to release. * Update data/readme.txt with new version * Update .github/workflows/windows_build_test_and_push.yml with new name, filename, tag, and artifact - * Name is currently TBD. Update and remove this line prior to release. * Create a new tag and release on github * Push and merge on github * Wait for build, confirm updates