second try to get fdm_materials to work

Aurelius-Nero · Sep 18, 2023 · 1745ed4 · 1745ed4
1 parent fe0d615
commit 1745ed4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -168,7 +168,7 @@ jobs:
         run: conan config set storage.download_cache="$HOME/.conan/conan_download_cache"
 
       - name: Create the Packages (Bash)
-        run: conan install $CURA_CONAN_VERSION ${{ inputs.conan_args }} --build=missing --update -if cura_inst -g VirtualPythonEnv -o cura:enterprise=$ENTERPRISE -o cura:staging=$STAGING --json "cura_inst/conan_install_info.json"
+        run: conan install $CURA_CONAN_VERSION ${{ inputs.conan_args }} --build=missing --update -if cura_inst -g VirtualPythonEnv -o cura:enterprise=$ENTERPRISE -o cura:staging=$STAGING --json "cura_inst/conan_install_info.json" --require-override=fdm_materials/latest@Aurelius-Nero/master
 
       #- name: Upload the Package(s)
       #  if: always()

diff --git a/conanfile.py b/conanfile.py
@@ -319,7 +319,7 @@ def requirements(self):
             self.requires("cura_private_data/(latest)@ultimaker/testing")
             self.requires("fdm_materials/(latest)@internal/testing")
         else:
-            self.requires("fdm_materials/(latest)@Aurelius-Nero/master")
+            self.requires("fdm_materials/(latest)@ultimaker/testing")
 
     def build_requirements(self):
         if self.options.devtools: