OMGeeky/ATCS
1
0
Fork 0
mirror of https://github.com/OMGeeky/ATCS.git synced 2025-12-26 23:57:25 +01:00
Code Issues Packages Projects Releases 15 Wiki Activity

Update installer script and release workflow to improve version handling

Browse Source
This commit is contained in:
OMGeeky
2025-02-16 01:07:44 +01:00
parent a2640c2da0
commit b58d080f4d
2 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
.github/workflows/release.yml vendored
View File

@@ -17,7 +17,7 @@ jobs:
run: | run: |
echo "Reading version from file:" echo "Reading version from file:"
cat packaging/ATCS_latest cat packaging/ATCS_latest
VERSION=$(cat packaging/ATCS_latest | sed 's/^v//' | sed 's/[^0-9.]//g') VERSION=$(cat packaging/ATCS_latest)
echo "Processed version: $VERSION" echo "Processed version: $VERSION"
echo "VERSION=$VERSION" >> $GITHUB_ENV echo "VERSION=$VERSION" >> $GITHUB_ENV
echo "Environment variable set to: $VERSION" echo "Environment variable set to: $VERSION"
@@ -30,6 +30,11 @@ jobs:
- name: Install NSIS - name: Install NSIS
uses: joncloud/makensis-action@v4 uses: joncloud/makensis-action@v4
env:
VERSION: ${{ env.VERSION }}
with:
script-file: packaging/Windows/ATCS_Installer.nsi
arguments: /DVERSION="${{ env.VERSION }}"
- name: Build JAR - name: Build JAR
shell: bash shell: bash
@@ -39,18 +44,8 @@ jobs:
echo "Building JAR and ZIP for version: ${{ env.VERSION }}" echo "Building JAR and ZIP for version: ${{ env.VERSION }}"
./package.sh -windows ./package.sh -windows
echo "Created artifacts:" echo "Created artifacts:"
ls -la ATCS_${{ env.VERSION }}.zip
ls -la common/ATCS.jar ls -la common/ATCS.jar
ls -la ATCS_${{ env.VERSION }}.zip
- name: Create Installer
shell: bash
run: |
cd packaging/Windows
ls -la
echo "Building installer for version: ${{ env.VERSION }}"
makensis /DVERSION="${{ env.VERSION }}" ATCS_Installer.nsi
echo "Created installer:"
ls -la ATCS_v${{ env.VERSION }}_Setup.exe
- name: Upload ZIP to Release - name: Upload ZIP to Release
uses: actions/upload-release-asset@v1 uses: actions/upload-release-asset@v1
@@ -68,6 +63,6 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with: with:
upload_url: ${{ github.event.release.upload_url }} upload_url: ${{ github.event.release.upload_url }}
asset_path: ./packaging/Windows/ATCS_v${{ env.VERSION }}_Setup.exe asset_path: ./packaging/ATCS_${{ env.VERSION }}_Setup.exe
asset_name: ATCS_v${{ env.VERSION }}_Setup.exe asset_name: ATCS_${{ env.VERSION }}_Setup.exe
asset_content_type: application/octet-stream asset_content_type: application/octet-stream

12
packaging/Windows/ATCS_Installer.nsi
View File

@@ -1,12 +1,12 @@
!include MUI2.nsh !include MUI2.nsh
; Version will be passed as /DVERSION=x.x.x ; Version will be passed as /DVERSION=vx.x.x
!define TRAINER_VERSION "0.1.5" !define TRAINER_VERSION "0.1.5"
!define JAVA_BIN "java" !define JAVA_BIN "java"
!define ATCS_SOURCE_DIR "..\..\" !define ATCS_SOURCE_DIR "..\..\"
Name "Andor's Trail Content Studio v${VERSION}" Name "Andor's Trail Content Studio ${VERSION}"
OutFile "ATCS_v${VERSION}_Setup.exe" OutFile "..\ATCS_${VERSION}_Setup.exe"
InstallDir "$PROGRAMFILES\ATCS\" InstallDir "$PROGRAMFILES\ATCS\"
;SetCompressor /SOLID /FINAL lzma ;SetCompressor /SOLID /FINAL lzma
@@ -14,10 +14,10 @@ InstallDir "$PROGRAMFILES\ATCS\"
Var StartMenuFolder Var StartMenuFolder
!define MUI_WELCOMEPAGE_TITLE "Welcome to Andor's Trail Content Studio installer" !define MUI_WELCOMEPAGE_TITLE "Welcome to Andor's Trail Content Studio installer"
!define MUI_WELCOMEPAGE_TEXT "This will install Andor's Trail Content Studio v${VERSION}" !define MUI_WELCOMEPAGE_TEXT "This will install Andor's Trail Content Studio ${VERSION}"
!define MUI_FINISHPAGE_TEXT "Andor's Trail Content Studio v${VERSION} - Install completed !" !define MUI_FINISHPAGE_TEXT "Andor's Trail Content Studio ${VERSION} - Install completed !"
!define MUI_STARTMENUPAGE_DEFAULTFOLDER "Andor's Trail Content Studio" !define MUI_STARTMENUPAGE_DEFAULTFOLDER "Andor's Trail Content Studio"
!define MUI_PAGE_HEADER_TEXT "Installing Andor's Trail Content Studio v${VERSION}" !define MUI_PAGE_HEADER_TEXT "Installing Andor's Trail Content Studio ${VERSION}"
;Start Menu Folder Page Configuration ;Start Menu Folder Page Configuration