Skip to content

Commit 3f9ff9d

Browse files
author
Levi
committed
Merge branch 'master' into release/v0.7.0
2 parents f8458ce + 2f9a573 commit 3f9ff9d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

.github/workflows/ci-conan.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
run: conan remote add osp https://osp-conan.azurewebsites.net/artifactory/api/conan/public --force
3939
- name: Conan create
4040
run: |
41-
BRANCH=${GITHUB_REF#refs/heads/}
41+
BRANCH=${GITHUB_REF#refs/*/}
4242
SHORT_BRANCH=${BRANCH:0:50}
4343
CHANNEL=${SHORT_BRANCH//\//_}
4444
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:
7474
- name: Conan create
7575
shell: bash
7676
run: |
77-
BRANCH=${GITHUB_REF#refs/heads/}
77+
BRANCH=${GITHUB_REF#refs/*/}
7878
SHORT_BRANCH=${BRANCH:0:50}
7979
CHANNEL=${SHORT_BRANCH//\//_}
8080
conan create -s build_type=${{ matrix.build_type }} -s compiler.version=${{ matrix.compiler_version }} -o libcosim:${{ matrix.option_fmuproxy }} . osp/${CHANNEL}

0 commit comments

Comments
 (0)