diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 1cabf719bd..81228e5f2d 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -196,14 +196,12 @@ jobs: f.write(content) f.writelines(f"INSTALLER_FILENAME={installer_filename}\n") - - name: Summarize the used Conan dependencies + - name: Summarize the used dependencies shell: python run: | import os - import json - from pathlib import Path - from cura.CuraVersion import ConanInstalls + from cura.CuraVersion import ConanInstalls, PythonInstalls summary_env = os.environ["GITHUB_STEP_SUMMARY"] content = "" @@ -215,27 +213,11 @@ jobs: f.write(content) f.writelines("# ${{ steps.filename.outputs.INSTALLER_FILENAME }}\n") f.writelines("## Conan packages:\n") - for dep_name, dep_info in ConanDependencies.items(): + for dep_name, dep_info in ConanInstalls.items(): f.writelines(f"`{dep_name} {dep_info['version']} {dep_info['revision']}`\n") - - name: Summarize the used Python modules - shell: python - run: | - import os - import pkg_resources - - from cura.CuraVersion import ConanDependencies - - summary_env = os.environ["GITHUB_STEP_SUMMARY"] - content = "" - if os.path.exists(summary_env): - with open(summary_env, "r") as f: - content = f.read() - - with open(summary_env, "w") as f: - f.write(content) f.writelines("## Python modules:\n") - for dep_name, dep_info in ConanDependencies.items(): + for dep_name, dep_info in PythonInstalls.items(): f.writelines(f"`{dep_name} {dep_info['version']}`\n") - name: Create the Linux AppImage (Bash) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 53fb119520..ef4e7e4a12 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -208,14 +208,12 @@ jobs: f.write(content) f.writelines(f"INSTALLER_FILENAME={installer_filename}\n") - - name: Summarize the used Conan dependencies + - name: Summarize the used dependencies shell: python run: | import os - import json - from pathlib import Path - from cura.CuraVersion import ConanInstalls + from cura.CuraVersion import ConanInstalls, PythonInstalls summary_env = os.environ["GITHUB_STEP_SUMMARY"] content = "" @@ -227,27 +225,11 @@ jobs: f.write(content) f.writelines("# ${{ steps.filename.outputs.INSTALLER_FILENAME }}\n") f.writelines("## Conan packages:\n") - for dep_name, dep_info in ConanDependencies.items(): + for dep_name, dep_info in ConanInstalls.items(): f.writelines(f"`{dep_name} {dep_info['version']} {dep_info['revision']}`\n") - - name: Summarize the used Python modules - shell: python - run: | - import os - import pkg_resources - - from cura.CuraVersion import PythonInstalls - - summary_env = os.environ["GITHUB_STEP_SUMMARY"] - content = "" - if os.path.exists(summary_env): - with open(summary_env, "r") as f: - content = f.read() - - with open(summary_env, "w") as f: - f.write(content) f.writelines("## Python modules:\n") - for dep_name, dep_info in ConanDependencies.items(): + for dep_name, dep_info in PythonInstalls.items(): f.writelines(f"`{dep_name} {dep_info['version']}`\n") - name: Create the Macos dmg (Bash) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index cd5e843878..176b4196c0 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -167,14 +167,12 @@ jobs: f.write(content) f.writelines(f"INSTALLER_FILENAME={installer_filename}\n") - - name: Summarize the used Conan dependencies + - name: Summarize the used dependencies shell: python run: | import os - import json - from pathlib import Path - from cura.CuraVersion import ConanInstalls + from cura.CuraVersion import ConanInstalls, PythonInstalls summary_env = os.environ["GITHUB_STEP_SUMMARY"] content = "" @@ -186,27 +184,11 @@ jobs: f.write(content) f.writelines("# ${{ steps.filename.outputs.INSTALLER_FILENAME }}\n") f.writelines("## Conan packages:\n") - for dep_name, dep_info in ConanDependencies.items(): + for dep_name, dep_info in ConanInstalls.items(): f.writelines(f"`{dep_name} {dep_info['version']} {dep_info['revision']}`\n") - - name: Summarize the used Python modules - shell: python - run: | - import os - import pkg_resources - - from cura.CuraVersion import PythonInstalls - - summary_env = os.environ["GITHUB_STEP_SUMMARY"] - content = "" - if os.path.exists(summary_env): - with open(summary_env, "r") as f: - content = f.read() - - with open(summary_env, "w") as f: - f.write(content) f.writelines("## Python modules:\n") - for dep_name, dep_info in ConanDependencies.items(): + for dep_name, dep_info in PythonInstalls.items(): f.writelines(f"`{dep_name} {dep_info['version']}`\n") - name: Create PFX certificate from BASE64_PFX_CONTENT secret