Merge remote-tracking branch 'upstream/master' into merge231

Hotfix: version 2.3.1
  Reduce the peer charges for well-behaved peers
  Update conan in the "nix" CI jobs
This commit is contained in:
Ed Hennis
2025-01-29 18:11:02 -05:00
32 changed files with 400 additions and 162 deletions

View File

@@ -63,6 +63,9 @@ jobs:
env:
build_dir: .build
steps:
- name: upgrade conan
run: |
pip install --upgrade "conan<2"
- name: checkout
uses: actions/checkout@v4
- name: check environment
@@ -122,6 +125,9 @@ jobs:
env:
build_dir: .build
steps:
- name: upgrade conan
run: |
pip install --upgrade "conan<2"
- name: download cache
uses: actions/download-artifact@v4
with:
@@ -170,6 +176,9 @@ jobs:
env:
build_dir: .build
steps:
- name: upgrade conan
run: |
pip install --upgrade "conan<2"
- name: download cache
uses: actions/download-artifact@v4
with:
@@ -240,6 +249,9 @@ jobs:
build_dir: .build
configuration: Release
steps:
- name: upgrade conan
run: |
pip install --upgrade "conan<2"
- name: download cache
uses: actions/download-artifact@v4
with: