diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 24f7a38..01bdda3 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -31,7 +31,7 @@ jobs: - name: Upload compiled wheels uses: actions/upload-artifact@v4 with: - name: dist + name: python-wheels path: dist/*.whl windows-installer: @@ -55,11 +55,11 @@ jobs: - name: Test built DeepLC exe run: dist/deeplc/deeplc.exe --ignore-gooey --help - name: Run Inno Setup - run: ISCC.exe ./deeplc_innosetup.iss /DMyAppVersion=$(python setup.py --version) + run: ISCC.exe ./deeplc_innosetup.iss /DAppVersion=${{ github.ref_name }} - name: Upload installer uses: actions/upload-artifact@v4 with: - name: dist + name: windows-installer path: dist/*.exe git-release: @@ -69,7 +69,6 @@ jobs: - name: Download installer uses: actions/download-artifact@v4 with: - name: dist path: dist - name: Create GitHub Release uses: docker://antonyurchenko/git-release:v4 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 88dee15..78dae12 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,6 +5,7 @@ on: branches: - master pull_request: + workflow_dispatch: jobs: test: diff --git a/deeplc_innosetup.iss b/deeplc_innosetup.iss index 9efbf8a..09316f7 100644 --- a/deeplc_innosetup.iss +++ b/deeplc_innosetup.iss @@ -1,23 +1,23 @@ -#define MyAppName "DeepLC" -#define MyAppPublisher "CompOmics" -#define MyAppURL "https://github.com/compomics/DeepLC" -#define MyAppExeName "deeplc.exe" +#define AppName "DeepLC" +#define AppPublisher "CompOmics" +#define AppURL "https://github.com/compomics/DeepLC" +#define AppExeName "deeplc.exe" [Setup] AppId={{5540C6D9-E2DE-42EC-90A7-8598F55EA165} -AppName={#MyAppName} -AppVersion={#MyAppVersion} -AppPublisher={#MyAppPublisher} -AppPublisherURL={#MyAppURL} -AppSupportURL={#MyAppURL} -AppUpdatesURL={#MyAppURL} -DefaultDirName={autopf}\{#MyAppName} +AppName={#AppName} +AppVersion={#AppVersion} +AppPublisher={#AppPublisher} +AppPublisherURL={#AppURL} +AppSupportURL={#AppURL} +AppUpdatesURL={#AppURL} +DefaultDirName={autopf}\{#AppName} DisableProgramGroupPage=yes LicenseFile=.\LICENSE PrivilegesRequired=lowest PrivilegesRequiredOverridesAllowed=dialog OutputDir="dist" -OutputBaseFilename="{#MyAppName}-{#MyAppVersion}-Windows64bit" +OutputBaseFilename="{#AppName}-{#AppVersion}-Windows64bit" Compression=lzma SolidCompression=yes WizardStyle=modern @@ -32,8 +32,8 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{ Source: "dist\deeplc\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs [Icons] -Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" -Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon +Name: "{autoprograms}\{#AppName}"; Filename: "{app}\{#AppExeName}" +Name: "{autodesktop}\{#AppName}"; Filename: "{app}\{#AppExeName}"; Tasks: desktopicon [Run] -Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent +Filename: "{app}\{#AppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(AppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent