From 4b4c70be3814e4389e71d70fa4f135750a4551b6 Mon Sep 17 00:00:00 2001 From: Joakim Haugen Date: Mon, 15 Apr 2024 09:31:25 +0200 Subject: [PATCH] Make conan channel 'stable' for 'main' not 'master' --- .github/workflows/ci-conan-gcc.yml | 2 +- .github/workflows/ci-conan-msvc.yml | 2 +- conanfile.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-conan-gcc.yml b/.github/workflows/ci-conan-gcc.yml index 61419ec..5592b8c 100755 --- 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 index dc13183..ca87e29 100755 --- 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 index 607448c..8d2806a 100644 --- 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):