diff --git a/.github/workflows/Nuitka-Windows.yml b/.github/workflows/Nuitka-Windows.yml index 7064be1..dd61fcf 100644 --- a/.github/workflows/Nuitka-Windows.yml +++ b/.github/workflows/Nuitka-Windows.yml @@ -33,7 +33,7 @@ jobs: CD src MKDIR Artemis - python -m nuitka --standalone --onefile --disable-console --assume-yes-for-downloads --follow-imports --enable-plugin=pyqt5 --enable-plugin=numpy --include-data-dir=themes=themes --include-data-dir=default_pics=default_pics --include-data-dir=$MOD_PATH\qtawesome=qtawesome --include-data-files=artemis.ui=artemis.ui --include-data-files=cacert.pem=cacert.pem --include-data-files=clickable_progress_bar.py=clickable_progress_bar.py --include-data-files=default_imgs.qrc=default_imgs.qrc --include-data-files=default_imgs_rc.py=default_imgs_rc.py --include-data-files=double_text_button.py=double_text_button.py --include-data-files=download_db_window.ui=download_db_window.ui --include-data-files=fixed_aspect_ratio_label.py=fixed_aspect_ratio_label.py --include-data-files=fixed_aspect_ratio_widget.py=fixed_aspect_ratio_widget.py --include-data-files=$MOD_PATH\pygame\libogg-0.dll=libogg-0.dll --include-data-files=$MOD_PATH\pygame\libopus-0.dll=libopus-0.dll --include-data-files=$MOD_PATH\pygame\libopusfile-0.dll=libopusfile-0.dll --include-data-files=$MOD_PATH\pygame\libvorbisfile-3.dll=libvorbisfile-3.dll --include-data-files=$MOD_PATH\pygame\libvorbis-0.dll=libvorbis-0.dll --windows-icon-from-ico=default_pics\Artemis3.ico --show-modules --windows-company-name=Aresvalley.com --windows-product-name=Artemis --windows-file-version=${{github.event.inputs.artemis_version}} --windows-product-version=${{github.event.inputs.artemis_version}} --windows-file-description=Artemis artemis.py + python -m nuitka --standalone --onefile --disable-console --assume-yes-for-downloads --follow-imports --include-package-data=pygame --enable-plugin=pyqt5 --include-data-dir=themes=themes --include-data-dir=default_pics=default_pics --include-data-dir=$MOD_PATH\qtawesome=qtawesome --include-data-files=artemis.ui=artemis.ui --include-data-files=cacert.pem=cacert.pem --include-data-files=clickable_progress_bar.py=clickable_progress_bar.py --include-data-files=default_imgs.qrc=default_imgs.qrc --include-data-files=default_imgs_rc.py=default_imgs_rc.py --include-data-files=double_text_button.py=double_text_button.py --include-data-files=download_db_window.ui=download_db_window.ui --include-data-files=fixed_aspect_ratio_label.py=fixed_aspect_ratio_label.py --include-data-files=fixed_aspect_ratio_widget.py=fixed_aspect_ratio_widget.py --windows-icon-from-ico=default_pics\Artemis3.ico --show-modules --windows-company-name=Aresvalley.com --windows-product-name=Artemis --windows-file-version=${{github.event.inputs.artemis_version}} --windows-product-version=${{github.event.inputs.artemis_version}} --windows-file-description=Artemis artemis.py python -m nuitka --standalone --onefile --disable-console --assume-yes-for-downloads --follow-imports --enable-plugin=pyqt5 --include-data-dir=$MOD_PATH\qtawesome=qtawesome --include-data-files=default_imgs_rc.py=default_imgs_rc.py --windows-icon-from-ico=default_pics\Artemis3.ico --show-modules --windows-company-name=Aresvalley.com --windows-product-name=Artemis --windows-file-version=${{github.event.inputs.artemis_version}} --windows-product-version=${{github.event.inputs.artemis_version}} --windows-file-description=Artemis updater.py MOVE artemis.exe Artemis.exe @@ -73,7 +73,7 @@ jobs: - uses: actions/upload-artifact@v3 with: - name: Artemis_v${{github.event.inputs.artemis_version}}_x64 + name: Artemis_v${{github.event.inputs.artemis_version}}_win_x64_Nuitka path: | .\src\Artemis.zip .\src\ArtemisUpdater.zip diff --git a/.github/workflows/PyInstaller-Windows.yml b/.github/workflows/PyInstaller-Windows.yml index 990c63e..b506673 100644 --- a/.github/workflows/PyInstaller-Windows.yml +++ b/.github/workflows/PyInstaller-Windows.yml @@ -2,6 +2,12 @@ name: PyInstaller - Windows on: workflow_dispatch: + inputs: + artemis_version: + description: 'Version' + required: true + default: '3.0.0' + type: string jobs: windows-pyinstaller: @@ -41,21 +47,21 @@ jobs: CD output MKDIR Artemis XCOPY /y Artemis.exe Artemis\ - XCOPY /e /k /y ..\..\..\src\themes Artemis\themes\ /EXCLUDE:..\excluded_files.txt + XCOPY /e /k /y ..\..\..\src\themes Artemis\themes\ XCOPY /y _ArtemisUpdater.exe Artemis\ ECHO "Compress files themes+Artemis.exe -> Artemis.zip" $compress = @{ Path = ".\Artemis.exe", "..\..\..\src\themes" CompressionLevel = "Optimal" - DestinationPath = ".\Artemis_win.zip" + DestinationPath = ".\Artemis.zip" } Compress-Archive @compress $compress = @{ Path = ".\_ArtemisUpdater.exe" CompressionLevel = "Optimal" - DestinationPath = ".\_ArtemisUpdater_win.zip" + DestinationPath = ".\ArtemisUpdater.zip" } Compress-Archive @compress @@ -63,17 +69,17 @@ jobs: $compress = @{ Path = "Artemis" CompressionLevel = "Optimal" - DestinationPath = ".\ArtemisWebsite_win.zip" + DestinationPath = ".\Artemis_v${{github.event.inputs.artemis_version}}_x64.zip" } Compress-Archive @compress - python ..\..\__get_hash_code.py Artemis_win.zip _ArtemisUpdater_win.zip ArtemisWebsite_win.zip > checksum.txt + python ..\..\__get_hash_code.py Artemis.zip ArtemisUpdater.zip Artemis_v${{github.event.inputs.artemis_version}}_x64.zip > checksum_SHA256.txt - uses: actions/upload-artifact@v3 with: - name: Artemis_Windows + name: Artemis_v${{github.event.inputs.artemis_version}}_win_x64_PyInstaller path: | - .\spec_files\Windows\output\Artemis_win.zip - .\spec_files\Windows\output\_ArtemisUpdater_win.zip - .\spec_files\Windows\output\ArtemisWebsite_win.zip - .\spec_files\Windows\output\checksum.txt + .\spec_files\Windows\output\Artemis.zip + .\spec_files\Windows\output\ArtemisUpdater.zip + .\spec_files\Windows\output\Artemis_v${{github.event.inputs.artemis_version}}_x64.zip + .\spec_files\Windows\output\checksum_SHA256.txt