CURA-10951 build plugin as bundled plugin on the GH runners

.github/workflows/conan-package-create.yml

@@ -119,7 +119,7 @@ jobs:
  sudo apt upgrade
  sudo apt install build-essential checkinstall libegl-dev zlib1g-dev libssl-dev ninja-build autoconf libx11-dev libx11-xcb-dev libfontenc-dev libice-dev libsm-dev libxau-dev libxaw7-dev libxcomposite-dev libxcursor-dev libxdamage-dev libxdmcp-dev libxext-dev libxfixes-dev libxi-dev libxinerama-dev libxkbfile-dev libxmu-dev libxmuu-dev libxpm-dev libxrandr-dev libxrender-dev libxres-dev libxss-dev libxt-dev libxtst-dev libxv-dev libxvmc-dev libxxf86vm-dev xtrans-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-xkb-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-xinerama0-dev xkb-data libxcb-dri3-dev uuid-dev libxcb-util-dev libxkbcommon-x11-dev pkg-config flex bison -y
 
- - name: Install GCC-132 on ubuntu
+ - name: Install GCC-13 on ubuntu
  if: ${{ startsWith(inputs.runs_on, 'ubuntu') }}
  run: |
  sudo apt install g++-13 gcc-13 -y

.github/workflows/installers.yml

@@ -24,9 +24,28 @@ on:
  default: false
  required: true
  type: boolean
+ nightly:
+ description: 'Upload to nightly release'
+ default: false
+ required: true
+ type: boolean
+ os_list:
+ description: 'List of OS(-variant)s to build for'
+ default: "windows, linux-modern, macos-x64, macos-arm64"
+ required: true
+ type: string
+ schedule:
+ # Daily at 5:20 CET
+ - cron: '20 4 * * *'
+
+env:
+ CURA_CONAN_VERSION: ${{ inputs.cura_conan_version }}
+ ENTERPRISE: ${{ inputs.enterprise }}
+ STAGING: ${{ inputs.staging }}
 
 jobs:
  windows-installer:
+ if: ${{ contains(inputs.os_list, 'windows') || github.event_name == 'schedule' }}
  uses: ./.github/workflows/windows.yml
  with:
  cura_conan_version: ${{ inputs.cura_conan_version }}
@@ -38,6 +57,7 @@ jobs:
  secrets: inherit
 
  linux-modern-installer:
+ if: ${{ contains(inputs.os_list, 'linux-modern') || github.event_name == 'schedule' }}
  uses: ./.github/workflows/linux.yml
  with:
  cura_conan_version: ${{ inputs.cura_conan_version }}
@@ -48,18 +68,8 @@ jobs:
  operating_system: ubuntu-22.04
  secrets: inherit
 
- linux-legacy-installer:
- uses: ./.github/workflows/linux.yml
- with:
- cura_conan_version: ${{ inputs.cura_conan_version }}
- conan_args: ${{ inputs.conan_args }}
- enterprise: ${{ inputs.enterprise }}
- staging: ${{ inputs.staging }}
- architecture: X64
- operating_system: ubuntu-20.04
- secrets: inherit
-
  macos-installer:
+ if: ${{ contains(inputs.os_list, 'macos-x64') }}
  uses: ./.github/workflows/macos.yml
  with:
  cura_conan_version: ${{ inputs.cura_conan_version }}
@@ -71,6 +81,7 @@ jobs:
  secrets: inherit
 
  macos-arm-installer:
+ if: ${{ contains(inputs.os_list, 'macos-arm64') }}
  uses: ./.github/workflows/macos.yml
  with:
  cura_conan_version: ${{ inputs.cura_conan_version }}
@@ -79,4 +90,189 @@ jobs:
  staging: ${{ inputs.staging }}
  architecture: ARM64
  operating_system: self-hosted
- secrets: inherit
+ secrets: inherit
+
+ # Run and update nightly release when the nightly input is set to true or if the schedule is triggered
+ update-nightly-release:
+ if: ${{ always() && (! cancelled()) && contains(needs.*.result, 'success') && (! contains(needs.*.result, 'failure')) && (inputs.nightly || github.event_name == 'schedule') }}
+ runs-on: ubuntu-latest
+ needs: [ windows-installer, linux-modern-installer, macos-installer, macos-arm-installer ]
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v3
+
+ # It's not necessary to download all three, but it does make sure we have at least one if an OS is skipped.
+
+ - name: Download the run info
+ if: ${{ contains(inputs.os_list, 'macos-x64') || contains(inputs.os_list, 'macos-arm64') }}
+ uses: actions/download-artifact@v2
+ with:
+ name: macos-run-info
+
+ - name: Download the run info II
+ if: ${{ contains(inputs.os_list, 'linux-modern') || github.event_name == 'schedule' }}
+ uses: actions/download-artifact@v2
+ with:
+ name: linux-run-info
+
+ - name: Download the run info III
+ if: ${{ contains(inputs.os_list, 'windows') || github.event_name == 'schedule' }}
+ uses: actions/download-artifact@v2
+ with:
+ name: windows-run-info
+
+ - name: Set the run info as environment variables
+ run: |
+ . run_info.sh 
+
+ - name: Output the name file name and extension
+ id: filename
+ shell: python
+ run: |
+ import os
+ import datetime
+ enterprise = "-Enterprise" if "${{ inputs.enterprise }}" == "true" else ""
+ os_list = [x.strip() for x in "${{ inputs.os_list }}".split(",")]
+ scheduled = "${{ github.event_name == 'schedule' }}" == "true"
+ if 'linux-modern' in os_list or scheduled:
+ linux_modern = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-linux-modern-X64"
+ if 'macos-x64' in os_list:
+ mac_x64_dmg = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-macos-X64"
+ mac_x64_pkg = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-macos-X64"
+ if 'macos-arm64' in os_list:
+ mac_arm_dmg = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-macos-ARM64"
+ mac_arm_pkg = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-macos-ARM64"
+ if 'windows' in os_list or scheduled:
+ win_msi = installer_filename = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-win64-X64"
+ win_exe = installer_filename = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-win64-X64"
+ nightly_name = "UltiMaker-Cura-" + os.getenv('CURA_VERSION_FULL').split("+")[0]
+ nightly_creation_time = str(datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"))
+ output_env = os.environ["GITHUB_OUTPUT"]
+ content = ""
+ if os.path.exists(output_env):
+ with open(output_env, "r") as f:
+ content = f.read()
+ with open(output_env, "w") as f:
+ f.write(content)
+ if 'linux-modern' in os_list or scheduled:
+ f.writelines(f"LINUX_MODERN={linux_modern}\n")
+ if 'macos-x64' in os_list:
+ f.writelines(f"MAC_X64_DMG={mac_x64_dmg}\n")
+ f.writelines(f"MAC_X64_PKG={mac_x64_pkg}\n")
+ if 'macos-arm64' in os_list:
+ f.writelines(f"MAC_ARM_DMG={mac_arm_dmg}\n")
+ f.writelines(f"MAC_ARM_PKG={mac_arm_pkg}\n")
+ if 'windows' in os_list or scheduled:
+ f.writelines(f"WIN_MSI={win_msi}\n")
+ f.writelines(f"WIN_EXE={win_exe}\n")
+ f.writelines(f"NIGHTLY_NAME={nightly_name}\n")
+ f.writelines(f"NIGHTLY_TIME={nightly_creation_time}\n")
+
+ - name: Download linux modern installer jobs artifacts
+ if: ${{ contains(inputs.os_list, 'linux-modern') || github.event_name == 'schedule' }}
+ uses: actions/download-artifact@v2
+ with:
+ name: ${{ steps.filename.outputs.LINUX_MODERN }}-AppImage
+ path: installers
+
+ - name: Download mac x64 dmg installer jobs artifacts
+ if: ${{ contains(inputs.os_list, 'macos-x64') }}
+ uses: actions/download-artifact@v2
+ with:
+ name: ${{ steps.filename.outputs.MAC_X64_DMG }}-dmg
+ path: installers
+
+ - name: Download mac x64 pkg installer jobs artifacts
+ if: ${{ contains(inputs.os_list, 'macos-x64') }}
+ uses: actions/download-artifact@v2
+ with:
+ name: ${{ steps.filename.outputs.MAC_X64_PKG }}-pkg
+ path: installers
+
+ - name: Download mac arm dmg installer jobs artifacts
+ if: ${{ contains(inputs.os_list, 'macos-arm64') }}
+ uses: actions/download-artifact@v2
+ with:
+ name: ${{ steps.filename.outputs.MAC_ARM_DMG }}-dmg
+ path: installers
+
+ - name: Download mac arm pkg installer jobs artifacts
+ if: ${{ contains(inputs.os_list, 'macos-arm64') }}
+ uses: actions/download-artifact@v2
+ with:
+ name: ${{ steps.filename.outputs.MAC_ARM_PKG }}-pkg
+ path: installers
+
+ - name: Download win msi installer jobs artifacts
+ if: ${{ contains(inputs.os_list, 'windows') || github.event_name == 'schedule' }}
+ uses: actions/download-artifact@v2
+ with:
+ name: ${{ steps.filename.outputs.WIN_MSI }}-msi
+ path: installers
+
+ - name: Download win exe installer jobs artifacts
+ if: ${{ contains(inputs.os_list, 'windows') || github.event_name == 'schedule' }}
+ uses: actions/download-artifact@v2
+ with:
+ name: ${{ steps.filename.outputs.WIN_EXE }}-exe
+ path: installers
+
+ - name: Rename Linux (modern) installer to nightlies
+ if: ${{ contains(inputs.os_list, 'linux-modern') || github.event_name == 'schedule' }}
+ run: |
+ mv installers/${{ steps.filename.outputs.LINUX_MODERN }}.AppImage installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-linux-modern-X64.AppImage
+
+ - name: Rename MacOS (X64) installers to nightlies
+ if: ${{ contains(inputs.os_list, 'macos-x64') }}
+ run: |
+ mv installers/${{ steps.filename.outputs.MAC_X64_DMG }}.dmg installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-X64.dmg
+ mv installers/${{ steps.filename.outputs.MAC_X64_PKG }}.pkg installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-X64.pkg
+
+ - name: Rename MacOS (ARM-64) installers to nightlies
+ if: ${{ contains(inputs.os_list, 'macos-arm64') }}
+ run: |
+ mv installers/${{ steps.filename.outputs.MAC_ARM_DMG }}.dmg installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-ARM64.dmg
+ mv installers/${{ steps.filename.outputs.MAC_ARM_PKG }}.pkg installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-ARM64.pkg
+
+ - name: Rename Windows installers to nightlies
+ if: ${{ contains(inputs.os_list, 'windows') || github.event_name == 'schedule' }}
+ run: |
+ mv installers/${{ steps.filename.outputs.WIN_MSI }}.msi installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-win64-X64.msi
+ mv installers/${{ steps.filename.outputs.WIN_EXE }}.exe installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-win64-X64.exe
+
+ - name: Update nightly release for Linux (modern)
+ if: ${{ contains(inputs.os_list, 'linux-modern') || github.event_name == 'schedule' }}
+ run: |
+ gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-linux-modern-X64.AppImage --clobber
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+ - name: Update nightly release for MacOS (X64)
+ if: ${{ contains(inputs.os_list, 'macos-x64') }}
+ run: |
+ gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-X64.dmg --clobber
+ gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-X64.pkg --clobber
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+ - name: Update nightly release for MacOS (ARM-64)
+ if: ${{ contains(inputs.os_list, 'macos-arm64') }}
+ run: |
+ gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-ARM64.dmg --clobber
+ gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-ARM64.pkg --clobber
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+ - name: Update nightly release for Windows
+ if: ${{ contains(inputs.os_list, 'windows') || github.event_name == 'schedule' }}
+ run: |
+ gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-win64-X64.msi --clobber
+ gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-win64-X64.exe --clobber
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+ - name: Update nightly release description (with date)
+ run: |
+ gh release edit nightly --title "${{ steps.filename.outputs.NIGHTLY_NAME }}" --notes "Nightly release created on: ${{ steps.filename.outputs.NIGHTLY_TIME }}"
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/linux.yml

@@ -119,10 +119,20 @@ jobs:
  sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
  sudo apt update
  sudo apt upgrade
- sudo apt install build-essential checkinstall libegl-dev zlib1g-dev libssl-dev ninja-build autoconf libx11-dev libx11-xcb-dev libfontenc-dev libice-dev libsm-dev libxau-dev libxaw7-dev libxcomposite-dev libxcursor-dev libxdamage-dev libxdmcp-dev libxext-dev libxfixes-dev libxi-dev libxinerama-dev libxkbfile-dev libxmu-dev libxmuu-dev libxpm-dev libxrandr-dev libxrender-dev libxres-dev libxss-dev libxt-dev libxtst-dev libxv-dev libxvmc-dev libxxf86vm-dev xtrans-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-xkb-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-xinerama0-dev xkb-data libxcb-dri3-dev uuid-dev libxcb-util-dev libxkbcommon-x11-dev pkg-config -y
+ sudo apt install build-essential checkinstall libegl-dev zlib1g-dev libssl-dev ninja-build autoconf libx11-dev libx11-xcb-dev libfontenc-dev libice-dev libsm-dev libxau-dev libxaw7-dev libxcomposite-dev libxcursor-dev libxdamage-dev libxdmcp-dev libxext-dev libxfixes-dev libxi-dev libxinerama-dev libxkbfile-dev libxmu-dev libxmuu-dev libxpm-dev libxrandr-dev libxrender-dev libxres-dev libxss-dev libxt-dev libxtst-dev libxv-dev libxvmc-dev libxxf86vm-dev xtrans-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-xkb-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-xinerama0-dev xkb-data libxcb-dri3-dev uuid-dev libxcb-util-dev libxkbcommon-x11-dev pkg-config binutils coreutils desktop-file-utils fakeroot fuse libgdk-pixbuf2.0-dev patchelf squashfs-tools strace util-linux zsync -y
+
+ # Get the AppImage tool
  wget --no-check-certificate --quiet https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage -O $GITHUB_WORKSPACE/appimagetool
  chmod +x $GITHUB_WORKSPACE/appimagetool
  echo "APPIMAGETOOL_LOCATION=$GITHUB_WORKSPACE/appimagetool" >> $GITHUB_ENV
+
+ # Get the AppImage builder
+ wget --no-check-certificate --quiet -O $GITHUB_WORKSPACE/appimage-builder-x86_64.AppImage https://github.com/AppImageCrafters/appimage-builder/releases/download/v1.1.0/appimage-builder-1.1.0-x86_64.AppImage
+ chmod +x appimage-builder-x86_64.AppImage
+ echo "APPIMAGEBUILDER_LOCATION=$GITHUB_WORKSPACE/appimage-builder-x86_64.AppImage" >> $GITHUB_ENV
+
+ # Make sure these tools can be found on the path
+ echo "$GITHUB_WORKSPACE" >> $GITHUB_PATH 
 
  - name: Install GCC-13
  run: |
@@ -179,10 +189,7 @@ jobs:
  run: |
  import os
  enterprise = "-Enterprise" if "${{ inputs.enterprise }}" == "true" else ""
- if "${{ inputs.operating_system }}" == "ubuntu-22.04":
- installer_filename = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-linux-modern-${{ inputs.architecture }}"
- else:
- installer_filename = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-linux-${{ inputs.architecture }}"
+ installer_filename = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-linux-${{ inputs.architecture }}"
  output_env = os.environ["GITHUB_OUTPUT"]
  content = ""
  if os.path.exists(output_env):
@@ -238,7 +245,7 @@ jobs:
 
  - name: Create the Linux AppImage (Bash)
  run: |
- python ../cura_inst/packaging/AppImage/create_appimage.py ./UltiMaker-Cura $CURA_VERSION_FULL "${{ steps.filename.outputs.INSTALLER_FILENAME }}.AppImage"
+ python ../cura_inst/packaging/AppImage-builder/create_appimage.py ./UltiMaker-Cura $CURA_VERSION_FULL "${{ steps.filename.outputs.INSTALLER_FILENAME }}.AppImage"
  chmod +x "${{ steps.filename.outputs.INSTALLER_FILENAME }}.AppImage"
  working-directory: dist
 
@@ -250,6 +257,20 @@ jobs:
  dist/${{ steps.filename.outputs.INSTALLER_FILENAME }}.AppImage
  retention-days: 5
 
+ - name: Write the run info
+ shell: python
+ run: |
+ import os
+ with open("run_info.sh", "w") as f:
+ f.writelines(f'echo "CURA_VERSION_FULL={os.environ["CURA_VERSION_FULL"]}" >> $GITHUB_ENV\n')
+ - name: Upload the run info
+ uses: actions/upload-artifact@v3
+ with:
+ name: linux-run-info
+ path: |
+ run_info.sh
+ retention-days: 5
+
  notify-export:
  if: ${{ always() }}
  needs: [ cura-installer-create ]

.github/workflows/macos.yml

@@ -264,6 +264,21 @@ jobs:
  dist/${{ steps.filename.outputs.INSTALLER_FILENAME }}.pkg
  retention-days: 5
 
+ - name: Write the run info
+ shell: python
+ run: |
+ import os
+ with open("run_info.sh", "w") as f:
+ f.writelines(f'echo "CURA_VERSION_FULL={os.environ["CURA_VERSION_FULL"]}" >> $GITHUB_ENV\n')
+
+ - name: Upload the run info
+ uses: actions/upload-artifact@v3
+ with:
+ name: macos-run-info
+ path: |
+ run_info.sh
+ retention-days: 5
+
 
  notify-export:
  if: ${{ always() }}