Make conan channel 'stable' for 'main' not 'master'

sintef-ocean · Apr 15, 2024 · 4b4c70b · 4b4c70b
1 parent 5c91425
commit 4b4c70b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/ci-conan-gcc.yml b/.github/workflows/ci-conan-gcc.yml
@@ -20,7 +20,7 @@ jobs:
         build_type: [Release]
         profile: [gcc]
         compiler_version: [12]
-        channel: ["${{ (github.head_ref || github.ref_name) == 'master' && 'stable' || 'testing' }}"]
+        channel: ["${{ (github.head_ref || github.ref_name) == 'main' && 'stable' || 'testing' }}"]
     container:
       image: conanio/gcc${{ matrix.compiler_version }}-ubuntu18.04
       options: -u 0

diff --git a/.github/workflows/ci-conan-msvc.yml b/.github/workflows/ci-conan-msvc.yml
@@ -20,7 +20,7 @@ jobs:
         build_type: [Release]
         profile: [msvc17]
         compiler_version: [193]
-        channel: ["${{ (github.head_ref || github.ref_name) == 'master' && 'stable' || 'testing' }}"]
+        channel: ["${{ (github.head_ref || github.ref_name) == 'main' && 'stable' || 'testing' }}"]
     steps:
       - uses: actions/checkout@v4
       - name: Install prerequisites

diff --git a/conanfile.py b/conanfile.py
@@ -50,7 +50,7 @@ def layout(self):
     def requirements(self):
         self.requires("fmi1/1.0.1")
         self.requires("fmi2/2.0.4")
-        self.requires("fmilib/2.4.1@sintef/testing")
+        self.requires("fmilib/2.4.1@sintef/stable")
         #self.requires("fmilib/2.4.1") # Pending fmilib on conan center index
 
     def source(self):