Skip to content
This repository was archived by the owner on Jan 18, 2024. It is now read-only.

Commit 52e0eac

Browse files
Khalil Estellkammce
authored andcommitted
💚 Fix bump conan version to 2.0.13
- conan==2.0.6 pip installation seems, but 2.0.13 seems to work just fine. - Split cmake and conan installations to make it easier to see which one is causing the break in pip installation. - The breakage due to clang-tidy was resolved in libhal-cmake-util by checking if the clang-tidy version was above major number 14, and disabling clang-tidy if it is below, posting a warning message to the user.
1 parent bf53368 commit 52e0eac

7 files changed

Lines changed: 40 additions & 22 deletions

File tree

.github/workflows/demo_builder.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ on:
2626
default: ${{ github.repository }}
2727
conan_version:
2828
type: string
29-
default: "2.0.6"
29+
default: "2.0.13"
3030
profile:
3131
type: string
3232
required: true
@@ -47,8 +47,11 @@ jobs:
4747
submodules: true
4848
repository: ${{ inputs.repo }}
4949

50-
- name: 📥 Install CMake + Conan
51-
run: pip3 install cmake conan==${{ inputs.conan_version }}
50+
- name: 📥 Install CMake 3.27.7
51+
run: pip3 install cmake==3.27.7
52+
53+
- name: 📥 Install Conan ${{ inputs.conan_version }}
54+
run: pip3 install conan==${{ inputs.conan_version }}
5255

5356
- name: 📡 Add `libhal` repo to conan remotes
5457
run: conan remote add libhal

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ on:
2828
default: ${{ github.repository }}
2929
conan_version:
3030
type: string
31-
default: "2.0.6"
31+
default: "2.0.13"
3232

3333
jobs:
3434
cortex-m0:

.github/workflows/deploy_unit.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ on:
2626
default: ${{ github.repository }}
2727
conan_version:
2828
type: string
29-
default: "2.0.6"
29+
default: "2.0.13"
3030
profile:
3131
required: true
3232
type: string
@@ -39,8 +39,11 @@ jobs:
3939
runs-on: ubuntu-22.04
4040
if: github.event.action == 'deleted'
4141
steps:
42-
- name: 📥 Install CMake + Conan
43-
run: pip3 install cmake conan==${{ inputs.conan_version }}
42+
- name: 📥 Install CMake 3.27.7
43+
run: pip3 install cmake==3.27.7
44+
45+
- name: 📥 Install Conan ${{ inputs.conan_version }}
46+
run: pip3 install conan==${{ inputs.conan_version }}
4447

4548
- name: 📡 Add `libhal` repo to conan remotes
4649
run: conan remote add libhal
@@ -72,8 +75,11 @@ jobs:
7275
submodules: true
7376
repository: ${{ inputs.repo }}
7477

75-
- name: 📥 Install CMake + Conan
76-
run: pip3 install cmake conan==${{ inputs.conan_version }}
78+
- name: 📥 Install CMake 3.27.7
79+
run: pip3 install cmake==3.27.7
80+
81+
- name: 📥 Install Conan ${{ inputs.conan_version }}
82+
run: pip3 install conan==${{ inputs.conan_version }}
7783

7884
- name: 📡 Add `libhal` repo to conan remotes
7985
run: conan remote add libhal

.github/workflows/library.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ on:
3838
default: ${{ github.repository }}
3939
conan_version:
4040
type: string
41-
default: "2.0.6"
41+
default: "2.0.13"
4242

4343
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
4444
permissions:

.github/workflows/platform_deploy.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ on:
2626
default: ${{ github.repository }}
2727
conan_version:
2828
type: string
29-
default: "2.0.6"
29+
default: "2.0.13"
3030
profile:
3131
type: string
3232
required: true
@@ -46,8 +46,11 @@ jobs:
4646
submodules: true
4747
repository: ${{ inputs.repo }}
4848

49-
- name: 📥 Install CMake + Conan
50-
run: pip3 install cmake conan==${{ inputs.conan_version }}
49+
- name: 📥 Install CMake 3.27.7
50+
run: pip3 install cmake==3.27.7
51+
52+
- name: 📥 Install Conan ${{ inputs.conan_version }}
53+
run: pip3 install conan==${{ inputs.conan_version }}
5154

5255
- name: 📡 Add `libhal` repo to conan remotes
5356
run: conan remote add libhal

.github/workflows/tests.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,11 @@ jobs:
4242
runs-on: ubuntu-22.04
4343
if: github.event.action == 'deleted'
4444
steps:
45-
- name: 📥 Install CMake + Conan
46-
run: pip3 install cmake conan==${{ inputs.conan_version }}
45+
- name: 📥 Install CMake 3.27.7
46+
run: pip3 install cmake==3.27.7
47+
48+
- name: 📥 Install Conan ${{ inputs.conan_version }}
49+
run: pip3 install conan==${{ inputs.conan_version }}
4750

4851
- name: 📡 Add `libhal` repo to conan remotes
4952
run: conan remote add libhal
@@ -77,7 +80,7 @@ jobs:
7780
compiler_version: 12
7881
os: ubuntu-22.04
7982
standard_library: libstdc++
80-
installations: wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - && sudo add-apt-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main" && sudo apt-get install -y clang-tidy-16
83+
installations: sudo apt install -y clang-tidy-15
8184
enable_coverage: ${{ inputs.coverage }}
8285
profile_path: profiles/x86_64/linux/
8386

@@ -106,8 +109,11 @@ jobs:
106109
if: ${{ matrix.installations != '' }}
107110
run: ${{ matrix.installations }}
108111

109-
- name: 📥 Install CMake + Conan
110-
run: pip3 install cmake conan==${{ inputs.conan_version }}
112+
- name: 📥 Install CMake 3.27.7
113+
run: pip3 install cmake==3.27.7
114+
115+
- name: 📥 Install Conan ${{ inputs.conan_version }}
116+
run: pip3 install conan==${{ inputs.conan_version }}
111117

112118
- name: 📡 Add `libhal` repo to conan remotes
113119
run: conan remote add libhal

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ Inputs:
209209
- `repo`: The GitHub repository where the library is located. Default is the
210210
repository where the workflow is running.
211211
- `conan_version`: The version of Conan to use for building the library. Default
212-
is "2.0.6".
212+
is "2.0.13".
213213

214214
This workflow is designed to be used in any GitHub Actions workflow by
215215
referencing it with the `uses` keyword and providing the necessary inputs. If an
@@ -228,7 +228,7 @@ Inputs:
228228
- `repo`: The GitHub repository where the library is located. Default is the
229229
repository where the workflow is running.
230230
- `conan_version`: The version of Conan to use for building the library. Default
231-
is "2.0.6".
231+
is "2.0.13".
232232

233233
This workflow creates a job for each supported device and architecture. Each job
234234
uses the `deploy_unit.yml` workflow to build a package for the specified device
@@ -253,7 +253,7 @@ Inputs:
253253
- `repo`: The GitHub repository where the library is located. Default is the
254254
repository where the workflow is running.
255255
- `conan_version`: The version of Conan to use for building the library. Default
256-
is "2.0.6".
256+
is "2.0.13".
257257
- `profile`: The profile to use for building the package. This input is
258258
required.
259259
- `upload`: A boolean value indicating whether to upload the built package to
@@ -289,7 +289,7 @@ Inputs:
289289
- `repo`: The GitHub repository where the library is located. Default is the
290290
repository where the workflow is running.
291291
- `conan_version`: The version of Conan to use for building the library. Default
292-
is "2.0.6".
292+
is "2.0.13".
293293
- `profile`: The profile to use for building the demo. This input is required.
294294
- `processor_profile`: The URL of the processor profile to use for building the
295295
demo. Default is an empty string.

0 commit comments

Comments
 (0)