Merge branch 'main' into CURA-10475_engineplugin

Ultimaker · Aug 19, 2023 · 296921d · 296921d
2 parents fa52469 + fbfb4b8
commit 296921d
Show file tree

Hide file tree

Showing 6 changed files with 515 additions and 2 deletions.
diff --git a/.github/workflows/cura-installer.yml b/.github/workflows/cura-installer.yml
@@ -155,7 +155,7 @@ jobs:
                     sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 10
 
             -   name: Create the default Conan profile
-                run:  conan profile new default --detect
+                run:  conan profile new default --detect --force
 
             -   name: Configure GPG Key Linux (Bash)
                 if: ${{ runner.os == 'Linux' }}

diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml
@@ -0,0 +1,77 @@
+name: All installers
+run-name: ${{ inputs.cura_conan_version }} by @${{ github.actor }}
+
+on:
+    workflow_dispatch:
+        inputs:
+            cura_conan_version:
+                description: 'Cura Conan Version'
+                default: 'cura/latest@ultimaker/testing'
+                required: true
+                type: string
+            conan_args:
+                description: 'Conan args: eq.: --require-override'
+                default: ''
+                required: false
+                type: string
+            enterprise:
+                description: 'Build Cura as an Enterprise edition'
+                default: false
+                required: true
+                type: boolean
+            staging:
+                description: 'Use staging API'
+                default: false
+                required: true
+                type: boolean
+
+jobs:
+    windows-installer:
+        uses: ./.github/workflows/windows.yml
+        with:
+            cura_conan_version: ${{ inputs.cura_conan_version }}
+            conan_args: ${{ inputs.conan_args }}
+            enterprise: ${{ inputs.enterprise }}
+            staging: ${{ inputs.staging }}
+            architecture: X64
+            operating_system: windows-2022
+
+    linux-modern-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-22.04
+
+    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
+
+    macos-installer:
+        uses: ./.github/workflows/macos.yml
+        with:
+            cura_conan_version: ${{ inputs.cura_conan_version }}
+            conan_args: ${{ inputs.conan_args }}
+            enterprise: ${{ inputs.enterprise }}
+            staging: ${{ inputs.staging }}
+            architecture: X64
+            operating_system: macos-11.0
+
+    macos-arm-installer:
+        uses: ./.github/workflows/macos.yml
+        with:
+            cura_conan_version: ${{ inputs.cura_conan_version }}
+            conan_args: ${{ inputs.conan_args }}
+            enterprise: ${{ inputs.enterprise }}
+            staging: ${{ inputs.staging }}
+            architecture: ARM64
+            operating_system: self-hosted
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -0,0 +1,89 @@
+name: Linux Installer
+run-name: ${{ inputs.cura_conan_version }} for Linux-${{ inputs.architecture }} by @${{ github.actor }}
+
+on:
+    workflow_dispatch:
+        inputs:
+            cura_conan_version:
+                description: 'Cura Conan Version'
+                default: 'cura/latest@ultimaker/testing'
+                required: true
+                type: string
+            conan_args:
+                description: 'Conan args: eq.: --require-override'
+                default: ''
+                required: false
+                type: string
+            enterprise:
+                description: 'Build Cura as an Enterprise edition'
+                default: false
+                required: true
+                type: boolean
+            staging:
+                description: 'Use staging API'
+                default: false
+                required: true
+                type: boolean
+            architecture:
+                description: 'Architecture'
+                required: true
+                default: 'X64'
+                type: choice
+                options:
+                    - X64
+            operating_system:
+                description: 'OS'
+                required: true
+                default: 'ubuntu-22.04'
+                type: choice
+                options:
+                    - ubuntu-22.04
+                    - ubuntu-20.04
+    workflow_call:
+        inputs:
+            cura_conan_version:
+                description: 'Cura Conan Version'
+                default: 'cura/latest@ultimaker/testing'
+                required: true
+                type: string
+            conan_args:
+                description: 'Conan args: eq.: --require-override'
+                default: ''
+                required: false
+                type: string
+            enterprise:
+                description: 'Build Cura as an Enterprise edition'
+                default: false
+                required: true
+                type: boolean
+            staging:
+                description: 'Use staging API'
+                default: false
+                required: true
+                type: boolean
+            architecture:
+                description: 'Architecture'
+                required: true
+                default: 'X64'
+                type: string
+            operating_system:
+                description: 'OS'
+                required: true
+                default: 'ubuntu-22.04'
+                type: string
+
+env:
+    CONAN_LOGIN_USERNAME_CURA: ${{ secrets.CONAN_USER }}
+    CONAN_PASSWORD_CURA: ${{ secrets.CONAN_PASS }}
+    GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
+    CURA_CONAN_VERSION: ${{ inputs.cura_conan_version }}
+    ENTERPRISE: ${{ inputs.enterprise }}
+    STAGING: ${{ inputs.staging }}
+
+jobs:
+    cura-installer-create:
+        runs-on: ${{ inputs.operating_system }}
+
+        steps:
+            -   name: Checkout
+                uses: actions/checkout@v3