mirror of
https://github.com/KeksPirates/SoftwareManager.git
synced 2026-08-03 17:39:42 +02:00
refactor: move build_info.json to root folder, update workflow to support changes, rename function to more accurate name
This commit is contained in:
@@ -125,8 +125,6 @@ jobs:
|
|||||||
--upx-binary="${{ env.UPX_BINARY }}" \
|
--upx-binary="${{ env.UPX_BINARY }}" \
|
||||||
--noinclude-qt-translations \
|
--noinclude-qt-translations \
|
||||||
--include-data-files=build_info.json=build_info.json \
|
--include-data-files=build_info.json=build_info.json \
|
||||||
--include-data-files=build_info.json=src/build_info.json \
|
|
||||||
--include-data-files=build_info.json=src/core/interface/build_info.json \
|
|
||||||
--output-filename=${{ env.APP_NAME }}.exe \
|
--output-filename=${{ env.APP_NAME }}.exe \
|
||||||
--output-dir=nuitka-build \
|
--output-dir=nuitka-build \
|
||||||
src/main.py
|
src/main.py
|
||||||
@@ -137,8 +135,6 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
pyinstaller --onefile --windowed \
|
pyinstaller --onefile --windowed \
|
||||||
--add-data "build_info.json:." \
|
--add-data "build_info.json:." \
|
||||||
--add-data "build_info.json:src/core" \
|
|
||||||
--add-data "build_info.json:src/core/interface" \
|
|
||||||
--exclude-module PyQt6 \
|
--exclude-module PyQt6 \
|
||||||
--exclude-module PyQt5 \
|
--exclude-module PyQt5 \
|
||||||
--hidden-import=backports.tarfile \
|
--hidden-import=backports.tarfile \
|
||||||
@@ -155,8 +151,6 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
pyinstaller --onefile \
|
pyinstaller --onefile \
|
||||||
--add-data "build_info.json:." \
|
--add-data "build_info.json:." \
|
||||||
--add-data "build_info.json:src/core" \
|
|
||||||
--add-data "build_info.json:src/core/interface" \
|
|
||||||
--exclude-module PyQt6 \
|
--exclude-module PyQt6 \
|
||||||
--exclude-module PyQt5 \
|
--exclude-module PyQt5 \
|
||||||
--hidden-import=backports.tarfile \
|
--hidden-import=backports.tarfile \
|
||||||
@@ -287,4 +281,4 @@ jobs:
|
|||||||
release/SoftwareManager-dev-${{ needs.build.outputs.short_sha }}-macos
|
release/SoftwareManager-dev-${{ needs.build.outputs.short_sha }}-macos
|
||||||
release/SHA256SUMS.txt
|
release/SHA256SUMS.txt
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
@@ -8,9 +8,9 @@ import platform
|
|||||||
import json
|
import json
|
||||||
import os
|
import os
|
||||||
|
|
||||||
def check_version():
|
def get_version():
|
||||||
# Get build info filepath
|
# Get build info filepath
|
||||||
build_info_path = Path(__file__).resolve().parents[3] / "build_info.json" # parents[3] = climb up 4 directories from the file ran
|
build_info_path = Path(__file__).resolve().parents[4] / "build_info.json" # parents[4] = climb up 5 directories from the file ran
|
||||||
if os.path.exists(build_info_path):
|
if os.path.exists(build_info_path):
|
||||||
with open(build_info_path, "r") as f:
|
with open(build_info_path, "r") as f:
|
||||||
build_info = json.load(f)
|
build_info = json.load(f)
|
||||||
|
|||||||
@@ -12,8 +12,8 @@ from core.interface.dialogs.settings import settings_dialog
|
|||||||
from core.interface.assets.base64_icons import logo_base64
|
from core.interface.assets.base64_icons import logo_base64
|
||||||
from core.interface.dialogs.eventfilter import eventFilter
|
from core.interface.dialogs.eventfilter import eventFilter
|
||||||
from core.utils.network.download import download_selected
|
from core.utils.network.download import download_selected
|
||||||
from core.interface.dialogs.update import check_version
|
|
||||||
from core.interface.utils.tabhelper import create_tab
|
from core.interface.utils.tabhelper import create_tab
|
||||||
|
from core.interface.dialogs.update import get_version
|
||||||
from core.utils.general.shutdown import closehelper
|
from core.utils.general.shutdown import closehelper
|
||||||
from core.utils.general.wrappers import run_thread
|
from core.utils.general.wrappers import run_thread
|
||||||
from core.interface.dialogs.image import Image
|
from core.interface.dialogs.image import Image
|
||||||
@@ -87,7 +87,7 @@ class MainWindow(QtWidgets.QMainWindow, QWidget):
|
|||||||
|
|
||||||
# Get current version
|
# Get current version
|
||||||
# core.interface.dialogs.update
|
# core.interface.dialogs.update
|
||||||
check_version()
|
get_version()
|
||||||
|
|
||||||
# Initialize Window
|
# Initialize Window
|
||||||
self.setWindowTitle("Software Manager")
|
self.setWindowTitle("Software Manager")
|
||||||
|
|||||||
Reference in New Issue
Block a user