Skip to content

Commit 15bf769

Browse files
committed
Github action update
1 parent 484260e commit 15bf769

File tree

1 file changed

+4
-40
lines changed

1 file changed

+4
-40
lines changed

.github/workflows/build-and-test.yml

Lines changed: 4 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,12 @@ jobs:
1515
- uses: actions/checkout@v4
1616
- name: Install Conan
1717
uses: turtlebrowser/get-conan@main
18-
- name: Cache conan packages
19-
id: cache-conan
20-
uses: actions/cache@v3
21-
env:
22-
cache-name: cache-conan-packages
23-
with:
24-
path: ~/.conan2
25-
key: ${{ runner.os }}-${{ matrix.build_type }}-${{ env.cache-name }}-${{ hashFiles('**/conan.lock') }}
26-
restore-keys: |
27-
${{ runner.os }}-${{ matrix.build_type }}-${{ env.cache-name }}-
28-
${{ runner.os }}-${{ matrix.build_type }}-
29-
${{ runner.os }}-
3018
- name: Configure Conan
3119
run: |
32-
conan profile detect -f
20+
conan profile detect
3321
conan remote add osp https://osp.jfrog.io/artifactory/api/conan/conan-local --force
3422
- name: Install dependencies
35-
run: conan install --build=missing --output-folder=build -s build_type=${{ matrix.build_type }} --lockfile-out ~/.conan2/conan.lock .
23+
run: conan install --build=missing --output-folder=build -s build_type=${{ matrix.build_type }} .
3624
- name: Generate build system
3725
run: cmake --preset conan-$(echo ${{ matrix.build_type }} | tr '[:upper:]' '[:lower:]') -DPROXYFMU_BUILD_EXAMPLES=ON -DPROXYFMU_BUILD_TESTS=ON
3826
- name: Build
@@ -46,12 +34,6 @@ jobs:
4634
with:
4735
name: proxyfmu
4836
path: build/bin/proxyfmu*
49-
- name: Save cache
50-
id: cache-conan-save
51-
uses: actions/cache/save@v3
52-
with:
53-
path: ~/.conan2
54-
key: ${{ runner.os }}-${{ matrix.build_type }}-${{ env.cache-name }}-${{ hashFiles('**/conan.lock') }}
5537

5638
windows:
5739
name: Windows
@@ -65,24 +47,12 @@ jobs:
6547
- uses: actions/checkout@v4
6648
- name: Install Conan
6749
uses: turtlebrowser/get-conan@main
68-
- name: Cache conan packages
69-
id: cache-conan
70-
uses: actions/cache@v3
71-
env:
72-
cache-name: cache-conan-packages
73-
with:
74-
path: ~/.conan2
75-
key: ${{ runner.os }}-${{ matrix.build_type }}-${{ env.cache-name }}-${{ hashFiles('**/conan.lock') }}
76-
restore-keys: |
77-
${{ runner.os }}-${{ matrix.build_type }}-${{ env.cache-name }}-
78-
${{ runner.os }}-${{ matrix.build_type }}-
79-
${{ runner.os }}-
8050
- name: Configure Conan
8151
run: |
82-
conan profile detect -f
52+
conan profile detect
8353
conan remote add osp https://osp.jfrog.io/artifactory/api/conan/conan-local --force
8454
- name: Install dependencies
85-
run: conan install --build=missing --output-folder=build -s build_type=${{ matrix.build_type }} --lockfile-out ~/.conan2/conan.lock .
55+
run: conan install --build=missing --output-folder=build -s build_type=${{ matrix.build_type }} .
8656
- name: Generate build system
8757
run: cmake --preset conan-default -DPROXYFMU_BUILD_EXAMPLES=ON -DPROXYFMU_BUILD_TESTS=ON
8858
- name: Build
@@ -96,9 +66,3 @@ jobs:
9666
with:
9767
name: proxyfmu
9868
path: build/bin/proxyfmu*
99-
- name: Save cache
100-
id: cache-conan-save
101-
uses: actions/cache/save@v3
102-
with:
103-
path: ~/.conan2
104-
key: ${{ runner.os }}-${{ matrix.build_type }}-${{ env.cache-name }}-${{ hashFiles('**/conan.lock') }}

0 commit comments

Comments
 (0)