From 23ae6bacfc96d664f6a71144c396a7a9690fc7a1 Mon Sep 17 00:00:00 2001 From: Gage Larsen Date: Thu, 13 Aug 2026 15:10:33 -0600 Subject: [PATCH] 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) --- .github/workflows/Coverage.yaml | 2 +- .github/workflows/XmsCore-CI.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/Coverage.yaml b/.github/workflows/Coverage.yaml index f3bf039b..48e74338 100644 --- a/.github/workflows/Coverage.yaml +++ b/.github/workflows/Coverage.yaml @@ -45,7 +45,7 @@ jobs: - name: Install Python Dependencies run: | pip install conan wheel "gcovr>=7,<9" - pip install --upgrade "xmsconan>=2.16.0" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple + pip install --upgrade "xmsconan>=2.18.0" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple - name: Setup Conan run: xmsconan_conan_setup --remote-url ${{ env.CONAN_REMOTE_URL }} --login diff --git a/.github/workflows/XmsCore-CI.yaml b/.github/workflows/XmsCore-CI.yaml index 698860c1..fd5a3ed7 100644 --- a/.github/workflows/XmsCore-CI.yaml +++ b/.github/workflows/XmsCore-CI.yaml @@ -42,7 +42,7 @@ jobs: run: | python -m pip install --upgrade pip pip install flake8 flake8-docstrings flake8-bugbear flake8-import-order pep8-naming - pip install "xmsconan==2.16.0" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple + pip install --upgrade "xmsconan>=2.18.0" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple # Generate .flake8 so CI lints with the same config developers use locally. # Do not inline the flake8 settings here: that duplicates .flake8.jinja and # the two copies drift apart silently. @@ -113,7 +113,7 @@ jobs: # package_id computation and silently detach builds from the binaries # already published to the remote. Bump this deliberately. pip install "conan~=2.31.0" devpi-client wheel - python -m pip install --upgrade "xmsconan==2.16.0" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple + python -m pip install --upgrade "xmsconan>=2.18.0" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple # Setup Conan - name: Setup Conan run: xmsconan_conan_setup --remote-url ${{ env.CONAN_REMOTE_URL }} --login --remove-conancenter @@ -250,7 +250,7 @@ jobs: # package_id computation and silently detach builds from the binaries # already published to the remote. Bump this deliberately. pip install "conan~=2.31.0" devpi-client wheel - pip install --upgrade "xmsconan==2.16.0" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple + pip install --upgrade "xmsconan>=2.18.0" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple # Setup Conan - name: Setup Conan run: xmsconan_conan_setup --remote-url ${{ env.CONAN_REMOTE_URL }} --login @@ -398,7 +398,7 @@ jobs: # package_id computation and silently detach builds from the binaries # already published to the remote. Bump this deliberately. pip install "conan~=2.31.0" devpi-client wheel - python -m pip install --upgrade "xmsconan==2.16.0" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple + python -m pip install --upgrade "xmsconan>=2.18.0" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple # Setup Visual Studio - name: Setup Visual Studio uses: microsoft/setup-msbuild@v2