Skip to content

Commit 2bf472f

Browse files
kammcekammce
authored
Merge 5.13.1 (#74)
* 👷 Removing macOS 13 from tests (#68) For some reason, `std::pmr::memory_resource` does not link on macOS 13. Rather than try to support an older version of mac, I am removing macOS 13 from the tests. We may bring back support and investigate fixing the pmr issue if there is demand for it. * :zap: Remove clang-11-dev install in lint (#73) * ⬆️ conan/2.16.1 * ⚡ Remove clang-11-dev install in lint
1 parent 1fc28cc commit 2bf472f

12 files changed

Lines changed: 21 additions & 25 deletions

File tree

‎.github/workflows/app_builder.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2024 Khalil Estell
1+
# Copyright 2024 - 2025 Khalil Estell and the libhal contributors
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@ on:
2525
default: ""
2626
conan_version:
2727
type: string
28-
default: "2.10.1"
28+
default: "2.16.1"
2929
compiler_profile_url:
3030
type: string
3131
required: true
@@ -66,7 +66,7 @@ jobs:
6666
repository: ${{ inputs.repo }}
6767

6868
- name: 📥 Install Conan ${{ inputs.conan_version }}
69-
run: pip3 install conan==${{ inputs.conan_version }}
69+
run: pipx install conan==${{ inputs.conan_version }}
7070

7171
- name: 📡 Add `libhal` repo to conan remotes
7272
run: conan remote add libhal

‎.github/workflows/demo_builder.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2024 Khalil Estell
1+
# Copyright 2024 - 2025 Khalil Estell and the libhal contributors
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ on:
2828
default: ""
2929
conan_version:
3030
type: string
31-
default: "2.10.1"
31+
default: "2.16.1"
3232
compiler_profile_url:
3333
type: string
3434
required: true
@@ -66,7 +66,7 @@ jobs:
6666
repository: ${{ inputs.repo }}
6767

6868
- name: 📥 Install Conan ${{ inputs.conan_version }}
69-
run: pip3 install conan==${{ inputs.conan_version }}
69+
run: pipx install conan==${{ inputs.conan_version }}
7070

7171
- name: 📡 Add `libhal` repo to conan remotes
7272
run: conan remote add libhal

‎.github/workflows/deploy.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2024 Khalil Estell
1+
# Copyright 2024 - 2025 Khalil Estell and the libhal contributors
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@ on:
2525
default: ${{ github.repository }}
2626
conan_version:
2727
type: string
28-
default: "2.10.1"
28+
default: "2.16.1"
2929
version:
3030
type: string
3131
default: ""

‎.github/workflows/deploy_all.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2024 Khalil Estell
1+
# Copyright 2024 - 2025 Khalil Estell and the libhal contributors
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ on:
3030
default: ""
3131
conan_version:
3232
type: string
33-
default: "2.10.1"
33+
default: "2.16.1"
3434

3535
jobs:
3636
linux_x86_64_clang:

‎.github/workflows/deploy_linux.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2024 Khalil Estell
1+
# Copyright 2024 - 2025 Khalil Estell and the libhal contributors
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@ on:
2525
default: ${{ github.repository }}
2626
conan_version:
2727
type: string
28-
default: "2.10.1"
28+
default: "2.16.1"
2929
version:
3030
type: string
3131
default: ""

‎.github/workflows/docs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2024 Khalil Estell
1+
# Copyright 2024 - 2025 Khalil Estell and the libhal contributors
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎.github/workflows/library_check.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2024 Khalil Estell
1+
# Copyright 2024 - 2025 Khalil Estell and the libhal contributors
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@ on:
4040
default: ${{ github.repository }}
4141
conan_version:
4242
type: string
43-
default: "2.10.1"
43+
default: "2.16.1"
4444

4545
jobs:
4646
tests:

‎.github/workflows/lint.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2024 Khalil Estell
1+
# Copyright 2024 - 2025 Khalil Estell and the libhal contributors
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -47,10 +47,6 @@ jobs:
4747
submodules: true
4848
repository: ${{ inputs.repo }}
4949

50-
- name: 📥 Install libclang-11-dev (for name style check)
51-
shell: bash
52-
run: sudo apt install libclang-11-dev
53-
5450
- name: 🌐 Downloading .clang-format from libhal
5551
run: wget https://raw.githubusercontent.com/libhal/libhal/main/.clang-format -O .clang-format
5652

‎.github/workflows/self_check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2024 Khalil Estell
1+
# Copyright 2024 - 2025 Khalil Estell and the libhal contributors
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

‎.github/workflows/take.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2024 Khalil Estell
1+
# Copyright 2024 - 2025 Khalil Estell and the libhal contributors
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)