Merge branch 'master' into release/v0.7.0

open-simulation-platform · May 29, 2020 · 3f9ff9d · 3f9ff9d
2 parents f8458ce + 2f9a573
commit 3f9ff9d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml
@@ -38,7 +38,7 @@ jobs:
         run: conan remote add osp https://osp-conan.azurewebsites.net/artifactory/api/conan/public --force
       - name: Conan create
         run: |
-          BRANCH=${GITHUB_REF#refs/heads/}
+          BRANCH=${GITHUB_REF#refs/*/}
           SHORT_BRANCH=${BRANCH:0:50}
           CHANNEL=${SHORT_BRANCH//\//_}
           conan create -s build_type=${{ matrix.build_type }} -s compiler.version=${{ matrix.compiler_version }} -s compiler.libcxx=${{ matrix.compiler_libcxx }} -o libcosim:${{ matrix.option_fmuproxy }} --build missing . osp/${CHANNEL}
@@ -74,7 +74,7 @@ jobs:
       - name: Conan create
         shell: bash
         run: |
-          BRANCH=${GITHUB_REF#refs/heads/}
+          BRANCH=${GITHUB_REF#refs/*/}
           SHORT_BRANCH=${BRANCH:0:50}
           CHANNEL=${SHORT_BRANCH//\//_}
           conan create -s build_type=${{ matrix.build_type }} -s compiler.version=${{ matrix.compiler_version }} -o libcosim:${{ matrix.option_fmuproxy }} . osp/${CHANNEL}