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

Jump to bottom

Packaging: simplify executables names #231

Merged
merged 3 commits into from
Mar 20, 2024
Merged

Packaging: simplify executables names #231

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
e0e6cd4
packaing: rename output executable to DicoGIS-gui or DicoGIS-cli
Guts Mar 20, 2024
985c966
ci: add minimal integration tests using cli
Guts Mar 20, 2024
5bc9c47
fix: typo in output name
Guts Mar 20, 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
22 changes: 16 additions & 6 deletions .github/workflows/builder_releaser.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,26 +72,32 @@ jobs:
- name: Generates executable for command-line version
run: |
python -O ./builder/pyinstaller_build_ubuntu_cli.py
chmod +x dist/DicoGIS-cli.bin

- name: Save CLI binary as artifact
uses: actions/upload-artifact@v4
with:
name: DicoGIS_executable_ubuntu_CLI
path: dist/DicoGIS-cli_*
path: dist/DicoGIS-cli.bin
if-no-files-found: error

- name: Generates executable for graphical version
run: |
python -O ./builder/pyinstaller_build_ubuntu_gui.py
chmod +x dist/DicoGIS-gui.bin

- name: Save it as artifact
uses: actions/upload-artifact@v4
with:
name: DicoGIS_executable_ubuntu_GUI
path: |
dist/DicoGIS-gui_*
path: dist/DicoGIS-gui.bin
if-no-files-found: error

- name: Minimal integration test
run: |
./dist/DicoGIS-cli.bin --help
./dist/DicoGIS-cli.bin --version

build-windows:
name: "🏠 Windows"
runs-on: windows-latest
Expand Down Expand Up @@ -131,7 +137,7 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: DicoGIS_executable_windows_CLI
path: dist/DicoGIS-cli_*
path: dist/DicoGIS-cli.exe
if-no-files-found: error

- name: Generates executable for graphical version
Expand All @@ -142,10 +148,14 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: DicoGIS_executable_windows_GUI
path: |
dist/DicoGIS-gui_*
path: dist/DicoGIS-gui.exe
if-no-files-found: error

- name: Minimal integration test
run: |
./dist/DicoGIS-cli.exe --help
./dist/DicoGIS-cli.exe --version

release:
name: "🚀 GitHub Release"
runs-on: ubuntu-latest
Expand Down
11 changes: 1 addition & 10 deletions builder/pyinstaller_build_ubuntu_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,13 @@
# ########## Libraries #############
# ##################################

import platform
import sys

# Standard library
from os import getenv
from pathlib import Path

# 3rd party
import distro
import PyInstaller.__main__

# package
Expand All @@ -38,14 +36,7 @@
"--collect-submodules=shellingham",
"--console",
"--log-level={}".format(getenv("PYINSTALLER_LOG_LEVEL", "WARN")),
"--name={}-cli_{}_{}{}_{}_Python{}".format(
__about__.__title_clean__,
__about__.__version__,
distro.id(),
distro.version(),
platform.architecture()[0],
platform.python_version(),
).replace(".", "-"),
f"--name={__about__.__title_clean__}-cli.bin",
"--noconfirm",
"--onefile",
str(package_folder.joinpath("cli/main.py")),
Expand Down
11 changes: 1 addition & 10 deletions builder/pyinstaller_build_ubuntu_gui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,13 @@
# ########## Libraries #############
# ##################################

import platform
import sys

# Standard library
from os import getenv
from pathlib import Path

# 3rd party
import distro
import PyInstaller.__main__

# package
Expand All @@ -36,14 +34,7 @@
"--add-data=LICENSE:.",
"--add-data=README.md:.",
"--log-level={}".format(getenv("PYINSTALLER_LOG_LEVEL", "WARN")),
"--name={}-gui_{}_{}{}_{}_Python{}".format(
__about__.__title_clean__,
__about__.__version__,
distro.id(),
distro.version(),
platform.architecture()[0],
platform.python_version(),
).replace(".", "-"),
f"--name={__about__.__title_clean__}-gui.bin",
"--noconfirm",
"--noupx",
# "--onedir",
Expand Down
10 changes: 1 addition & 9 deletions builder/pyinstaller_build_windows_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
# ########## Libraries #############
# ##################################

import platform
import sys

# Standard library
Expand Down Expand Up @@ -39,14 +38,7 @@
"--icon={}".format((package_folder / "bin/img/DicoGIS.ico").resolve()),
"--log-level={}".format(getenv("PYINSTALLER_LOG_LEVEL", "WARN")),
"--manifest={}".format((package_folder / "../builder/manifest.xml").resolve()),
"--name={}-cli_{}_{}{}_Python{}-{}".format(
__about__.__title_clean__,
__about__.__version__.replace(".", "-"),
platform.system(),
platform.architecture()[0],
platform.python_version_tuple()[0],
platform.python_version_tuple()[1],
),
f"--name={__about__.__title_clean__}-cli",
"--noconfirm",
"--noupx",
"--onefile",
Expand Down
10 changes: 1 addition & 9 deletions builder/pyinstaller_build_windows_gui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
# ########## Libraries #############
# ##################################

import platform
import sys

# Standard library
Expand Down Expand Up @@ -37,14 +36,7 @@
"--icon={}".format((package_folder / "bin/img/DicoGIS.ico").resolve()),
"--log-level={}".format(getenv("PYINSTALLER_LOG_LEVEL", "WARN")),
"--manifest={}".format((package_folder / "../builder/manifest.xml").resolve()),
"--name={}-gui_{}_{}{}_Python{}-{}".format(
__about__.__title_clean__,
__about__.__version__.replace(".", "-"),
platform.system(),
platform.architecture()[0],
platform.python_version_tuple()[0],
platform.python_version_tuple()[1],
),
f"--name={__about__.__title_clean__}-gui",
"--noconfirm",
"--noupx",
"--onefile",
Expand Down