From 61d276f5eefbfd98870dea95f7760672bedee974 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Fri, 1 Jul 2022 09:38:08 +0200 Subject: [PATCH] Use ultimaker/testing on main/master branches Contributes to CURA-9365 --- .github/workflows/conan-recipe-version.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index 6b04354de3..647c3a29f8 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -58,11 +58,11 @@ jobs: # FIXME: For release branches: maybe rename the branch to release/** echo '::set-output name=user::_' echo '::set-output name=channel::_' - elif [ "${{ github.ref_name == 'main' }}" = "true" ]; then - # commits on main are alpha's (nightlies) and are considered stable - # name/major.minor.patch-alpha+build@ultimaker/stable + elif [ "${{ github.ref_name == 'main' || github.ref_name == 'master' }}" = "true" ]; then + # commits on main/master are alpha's (nightlies) and are considered testing + # name/major.minor.patch-alpha+build@ultimaker/testing echo ${{ github.repository_owner }} | awk '{print "::set-output name=user::"tolower($0)}' - echo '::set-output name=channel::stable' + echo '::set-output name=channel::testing' elif [ "${{ github.ref_name == '5.1' }}" = "true" ]; then # commits on release branches are beta's and are considered stable # name/major.minor.patch-beta+build@ultimaker/stable