Skip to content

Commit

Permalink
Pulling over conan fixes from up-cpp
Browse files Browse the repository at this point in the history
We have temporarily rolled back to conan 2.3.2 until recipe issues with
conan 2.4.x have been resolved.

Removes the github cache action for conan cache in favor of using
artifacts. This is more stable across versions and builds.
  • Loading branch information
gregmedd committed Jun 19, 2024
1 parent 9a9abfa commit 23791f6
Showing 1 changed file with 13 additions and 20 deletions.
33 changes: 13 additions & 20 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,12 @@ jobs:
- name: Install Conan
id: conan
uses: turtlebrowser/get-conan@main
with:
version: 2.3.2

- name: Create default Conan profile
run: conan profile detect

- name: Conan cache archive
id: conan-cache
uses: actions/cache@v4
with:
key: ${{ runner.os }}-conan-cache
path: conan-cache.tgz

- name: Restore conan cache from archive
if: ${{ steps.conan-cache.outputs.cache-hit == 'true' }}
shell: bash
run: |
conan cache restore conan-cache.tgz
rm conan-cache.tgz
- name: Fetch up-core-api conan recipe
uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -85,6 +73,12 @@ jobs:
name: compile-commands
path: up-transport-zenoh-cpp/build/compile_commands.json

- name: Upload conan cache for linting
uses: actions/upload-artifact@v4
with:
name: conan-cache
path: ./conan-cache.tgz

test:
name: Run up-transport-zenoh-cpp tests
runs-on: ubuntu-latest
Expand Down Expand Up @@ -125,17 +119,16 @@ jobs:
- name: Install Conan
id: conan
uses: turtlebrowser/get-conan@main
with:
version: 2.3.2

- name: Create default Conan profile
run: conan profile detect

- name: Conan cache archive
id: conan-cache
uses: actions/cache@v4
- name: Get conan cache
uses: actions/download-artifact@v4
with:
key: ${{ runner.os }}-conan-cache
fail-on-cache-miss: true
path: conan-cache.tgz
name: conan-cache

- name: Restore conan cache from archive
shell: bash
Expand Down

0 comments on commit 23791f6

Please sign in to comment.