Browse Source

Use latest alias

Contributes to CURA-9365
j.spijker@ultimaker.com 2 years ago
parent
commit
2781725cea
2 changed files with 14 additions and 19 deletions
  1. 1 6
      .github/workflows/conan-recipe-version.yml
  2. 13 13
      conandata.yml

+ 1 - 6
.github/workflows/conan-recipe-version.yml

@@ -76,9 +76,4 @@ jobs:
             -   name: Get latest alias
                 id: latest-alias
                 run: |
-                    # FIXME: Remove the CURA-9365 clause once merged to main
-                    if [ "${{ github.ref_name == 'main' ||contains(github.ref_name, 'CURA-9365') }}" = "true" ]; then
-                      echo "::set-output name=recipe_id_latest::${{ inputs.project_name }}/latest@${{ steps.get-conan-broadcast-data.outputs.user }}/${{ steps.get-conan-broadcast-data.outputs.channel }}"
-                    else
-                      echo "::set-output name=recipe_id_latest::''"
-                    fi
+                    echo "::set-output name=recipe_id_latest::${{ inputs.project_name }}/latest@${{ steps.get-conan-broadcast-data.outputs.user }}/${{ steps.get-conan-broadcast-data.outputs.channel }}"

+ 13 - 13
conandata.yml

@@ -1,6 +1,6 @@
 "None":
     requirements:
-        - "arcus/[5.1.0-alpha.1]@ultimaker/cura_9365"
+        - "arcus/(latest)@ultimaker/stable"
         - "curaengine/(latest)@ultimaker/stable"
         - "savitar/(latest)@ultimaker/stable"
         - "pynest2d/(latest)@ultimaker/stable"
@@ -152,13 +152,13 @@
             Linux: "./icons/cura-128.png"
 "5.1.0-beta":
     requirements:
-        - "arcus/[5.1.0-beta]@ultimaker/stable"
-        - "curaengine/[5.1.0-beta]@ultimaker/stable"
-        - "savitar/[5.1.0-beta]@ultimaker/stable"
-        - "pynest2d/[5.1.0-beta]@ultimaker/stable"
-        - "uranium/[5.1.0-beta]@ultimaker/stable"
-        - "fdm_materials/[5.1.0-beta]@ultimaker/stable"
-        - "cura_binary_data/[5.1.0-beta]@ultimaker/stable"
+        - "arcus/(latest)@ultimaker/stable"
+        - "curaengine/(latest)@ultimaker/stable"
+        - "savitar/(latest)@ultimaker/stable"
+        - "pynest2d/(latest)@ultimaker/stable"
+        - "uranium/(latest)@ultimaker/stable"
+        - "fdm_materials/(latest)@ultimaker/stable"
+        - "cura_binary_data/(latest)@ultimaker/stable"
         - "cpython/3.10.4"
         - "libffi/3.2.1"
         - "mpdecimal/2.5.0"
@@ -228,11 +228,11 @@
             Linux: "./icons/cura-128.png"
 "5.1.0-alpha":
     requirements:
-        - "arcus/[5.1.0-alpha]@ultimaker/cura_9365"
-        - "curaengine/[5.1.0-alpha]@ultimaker/cura_9365"
-        - "savitar/[5.1.0-alpha]@ultimaker/cura_9365"
-        - "pynest2d/[5.1.0-alpha]@ultimaker/cura_9365"
-        - "uranium/[5.1.0-alpha]@ultimaker/cura_9365"
+        - "arcus/(latest)@ultimaker/cura_9365"
+        - "curaengine/(latest)@ultimaker/cura_9365"
+        - "savitar/(latest)@ultimaker/cura_9365"
+        - "pynest2d/(latest)@ultimaker/cura_9365"
+        - "uranium/(latest)@ultimaker/cura_9365"
         - "fdm_materials/5.1.0-CURA-9365-fix-building-cura-main+13@ultimaker/cura_9365"
         - "cura_binary_data/5.1.0-alpha+25@ultimaker/stable"
         - "cpython/3.10.4"