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

sintef-ocean · Apr 15, 2024 · 68d4dae · 68d4dae
1 parent 4f12deb
commit 68d4dae
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/ci-conan-gcc.yml b/.github/workflows/ci-conan-gcc.yml
@@ -21,7 +21,7 @@ jobs:
         profile: [gcc]
         compiler_version: [10, 11, 12]
         with_fmus: ["with_fmus=True", "with_fmus=False"]
-        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
@@ -21,7 +21,7 @@ jobs:
         profile: [msvc17]
         compiler_version: [192, 193]
         with_fmus: ["with_fmus=True", "with_fmus=False"]
-        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