Skip to content

Commit 1697586

Browse files
committed
Github action update
1 parent 399072e commit 1697586

File tree

1 file changed

+4
-28
lines changed

1 file changed

+4
-28
lines changed

.github/workflows/upload-conan-pkgs.yml

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,11 @@ jobs:
2727
- uses: actions/checkout@v4
2828
- name: Install compiler
2929
run: sudo apt-get install -y --no-install-recommends g++-${{ matrix.compiler_version }}
30-
- name: Cache conan packages
31-
id: cache-conan
32-
uses: actions/cache@v3
33-
env:
34-
cache-name: cache-conan-packages
35-
with:
36-
path: ~/.conan2
37-
key: ${{ runner.os }}-${{ matrix.build_type }}-${{ env.cache-name }}-${{ hashFiles('**/conan.lock') }}
38-
restore-keys: |
39-
${{ runner.os }}-${{ matrix.build_type }}-${{ env.cache-name }}-
40-
${{ runner.os }}-${{ matrix.build_type }}-
41-
${{ runner.os }}-
4230
- name: Install Conan
4331
uses: turtlebrowser/get-conan@main
4432
- name: Configure Conan
4533
run: |
46-
conan profile detect -f
34+
conan profile detect
4735
conan remote add osp https://osp.jfrog.io/artifactory/api/conan/conan-local --force
4836
- name: Conan create
4937
run: |
@@ -57,7 +45,7 @@ jobs:
5745
fi
5846
conan create -s build_type=${{ matrix.build_type }} -s compiler.version=${{ matrix.compiler_version }} -s compiler.libcxx=${{ matrix.compiler_libcxx }} -b missing . --user=osp --channel=${CHANNEL}
5947
- name: Conan upload
60-
run: conan upload --confirm --remote osp 'proxyfmu*'
48+
run: conan upload --confirm --remote osp '*'
6149

6250

6351
windows:
@@ -71,23 +59,11 @@ jobs:
7159

7260
steps:
7361
- uses: actions/checkout@v4
74-
- name: Cache conan packages
75-
id: cache-conan
76-
uses: actions/cache@v3
77-
env:
78-
cache-name: cache-conan-packages
79-
with:
80-
path: ~/.conan2
81-
key: ${{ runner.os }}-${{ matrix.build_type }}-${{ env.cache-name }}-${{ hashFiles('**/conan.lock') }}
82-
restore-keys: |
83-
${{ runner.os }}-${{ matrix.build_type }}-${{ env.cache-name }}-
84-
${{ runner.os }}-${{ matrix.build_type }}-
85-
${{ runner.os }}-
8662
- name: Install Conan
8763
uses: turtlebrowser/get-conan@main
8864
- name: Configure Conan
8965
run: |
90-
conan profile detect -f
66+
conan profile detect
9167
conan remote add osp https://osp.jfrog.io/artifactory/api/conan/conan-local --force
9268
- name: Conan create
9369
shell: bash
@@ -102,4 +78,4 @@ jobs:
10278
fi
10379
conan create -s build_type=${{ matrix.build_type }} -b missing . --user=osp --channel=${CHANNEL}
10480
- name: Conan upload
105-
run: conan upload --confirm --remote osp 'proxyfmu*'
81+
run: conan upload --confirm --remote osp '*'

0 commit comments

Comments
 (0)