Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix GUI publish workflow #72

Merged
merged 3 commits into from
Apr 13, 2024
Merged

Fix GUI publish workflow #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a27ee36
Fix GUI publish workflow; Add workflow dispatch trigger (uncommented …
RalfG Apr 12, 2024
c766edb
Use unique names for artefacts
RalfG Apr 12, 2024
c717e61
Uncomment steps that were disabled for testing
RalfG Apr 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
branches:
- master
pull_request:
workflow_dispatch:

jobs:
test:
Expand Down
30 changes: 15 additions & 15 deletions deeplc_innosetup.iss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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