Skip to content

Commit 23ae6ba

Browse files
gagelarsenclaude
andcommitted
Regenerate CI workflows with xmsconan 2.18.0
CI has to generate the recipe with the same xmsconan the manual VS2019 track uses, or the two remotes end up carrying different recipe revisions for the same version. XmsConan2File.export() copies xms_conan2_file.py into the export folder, so its contents feed the recipe revision hash. 2.18.0 changes that file by 192 lines (the msvc 192 fork: _is_vs2019, vs2019_requirements, vs2019_dependency_ overrides). A 7.0.x built by CI on the 2.16.0 pin and the same 7.0.x built locally for VS2019 on 2.18.0 would therefore export different recipes and resolve to different rrevs -- aquaveo-stable and aquaveo-vs2019 silently out of step on a version that reads as one release. Nothing else in the generated output moves. Diffed against a real 2.16.0 install: conanfile.py, CMakeLists.txt and pytest.ini are byte-identical (conanfile.py gains a vs2019_dependency_overrides attribute only when build.toml declares that table, and this one does not). build.py gains an exit 1 when builder.upload() reports errors instead of failing silently, and is not exported. On any toolchain that is not msvc 192 the dependency graph is unchanged: 2.18.0 refactored the inline self.requires("boost/1.86.0") / self.requires("zlib/1.3.1") calls into an iteration over default_requirements holding those same references in the same order. The pins also stop being pins. 2.17.0 floated generated CI onto >= with --upgrade, so this is the last regeneration commit this repo needs -- a later xmsconan reaches CI on its next run. The flake job picks up --upgrade here, which it lacked under the == pin. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
1 parent 931f2b9 commit 23ae6ba

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

.github/workflows/Coverage.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
- name: Install Python Dependencies
4646
run: |
4747
pip install conan wheel "gcovr>=7,<9"
48-
pip install --upgrade "xmsconan>=2.16.0" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple
48+
pip install --upgrade "xmsconan>=2.18.0" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple
4949
5050
- name: Setup Conan
5151
run: xmsconan_conan_setup --remote-url ${{ env.CONAN_REMOTE_URL }} --login

.github/workflows/XmsCore-CI.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
run: |
4343
python -m pip install --upgrade pip
4444
pip install flake8 flake8-docstrings flake8-bugbear flake8-import-order pep8-naming
45-
pip install "xmsconan==2.16.0" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple
45+
pip install --upgrade "xmsconan>=2.18.0" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple
4646
# Generate .flake8 so CI lints with the same config developers use locally.
4747
# Do not inline the flake8 settings here: that duplicates .flake8.jinja and
4848
# the two copies drift apart silently.
@@ -113,7 +113,7 @@ jobs:
113113
# package_id computation and silently detach builds from the binaries
114114
# already published to the remote. Bump this deliberately.
115115
pip install "conan~=2.31.0" devpi-client wheel
116-
python -m pip install --upgrade "xmsconan==2.16.0" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple
116+
python -m pip install --upgrade "xmsconan>=2.18.0" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple
117117
# Setup Conan
118118
- name: Setup Conan
119119
run: xmsconan_conan_setup --remote-url ${{ env.CONAN_REMOTE_URL }} --login --remove-conancenter
@@ -250,7 +250,7 @@ jobs:
250250
# package_id computation and silently detach builds from the binaries
251251
# already published to the remote. Bump this deliberately.
252252
pip install "conan~=2.31.0" devpi-client wheel
253-
pip install --upgrade "xmsconan==2.16.0" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple
253+
pip install --upgrade "xmsconan>=2.18.0" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple
254254
# Setup Conan
255255
- name: Setup Conan
256256
run: xmsconan_conan_setup --remote-url ${{ env.CONAN_REMOTE_URL }} --login
@@ -398,7 +398,7 @@ jobs:
398398
# package_id computation and silently detach builds from the binaries
399399
# already published to the remote. Bump this deliberately.
400400
pip install "conan~=2.31.0" devpi-client wheel
401-
python -m pip install --upgrade "xmsconan==2.16.0" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple
401+
python -m pip install --upgrade "xmsconan>=2.18.0" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple
402402
# Setup Visual Studio
403403
- name: Setup Visual Studio
404404
uses: microsoft/setup-msbuild@v2

0 commit comments

Comments
 (0)