Use uptodate linux installer workflow

Ultimaker · Sep 26, 2024 · 961862b · 961862b
1 parent 906e4e6
commit 961862b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml
@@ -10,7 +10,7 @@ on:
         required: true
         type: string
       conan_args:
-        description: 'Conan args: eq.: --require-override'
+        description: 'Conan args, e.g. --requires'
         default: ''
         required: false
         type: string
@@ -84,15 +84,15 @@ jobs:
       operating_system: self-hosted-Windows-X64
     secrets: inherit
 
+# FIXME: Use main once merged
   linux-installer:
-    uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@main
+    uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@CURA-11622_conan_v2
     needs: [ default_values ]
     with:
       cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }}
       conan_args: ${{ github.event.inputs.conan_args }}
       enterprise: ${{ github.event.inputs.enterprise == 'true' }}
       staging: ${{ github.event.inputs.staging == 'true' }}
-      architecture: X64
       operating_system: self-hosted-Ubuntu22-X64
     secrets: inherit
 

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -10,7 +10,7 @@ on:
         required: true
         type: string
       conan_args:
-        description: 'Conan args: eq.: --require-override'
+        description: 'Conan args, e.g. --requires'
         default: ''
         required: false
         type: string
@@ -24,13 +24,6 @@ on:
         default: false
         required: true
         type: boolean
-      architecture:
-        description: 'Architecture'
-        required: true
-        default: 'X64'
-        type: choice
-        options:
-          - X64
       operating_system:
         description: 'OS'
         required: true
@@ -41,13 +34,13 @@ on:
           - self-hosted-Ubuntu22-X64
 
 jobs:
+# FIXME: Use main once merged
   linux-installer:
-    uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@main
+    uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@CURA-11622_conan_v2
     with:
       cura_conan_version: ${{ inputs.cura_conan_version }}
       conan_args: ${{ inputs.conan_args }}
       enterprise: ${{ inputs.enterprise }}
       staging: ${{ inputs.staging }}
-      architecture: ${{ inputs.architecture }}
       operating_system: ${{ inputs.operating_system }}
     secrets: inherit