From 68d4daee9514f03a71f88c81a0a13656171f954e Mon Sep 17 00:00:00 2001 From: Joakim Haugen Date: Mon, 15 Apr 2024 09:29:20 +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 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-conan-gcc.yml b/.github/workflows/ci-conan-gcc.yml index 6bccbaf..8332e5b 100755 --- 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 index 0a8c1ba..7b44a4a 100755 --- 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