From 930b2f76d07122171cda5ede8540139dda2203d0 Mon Sep 17 00:00:00 2001 From: Mathias Kub Date: Wed, 25 Mar 2026 20:27:28 +0100 Subject: [PATCH 1/4] Add concon-odr-index as Git submodule --- .github/workflows/build_test.yml | 5 ----- .github/workflows/publish.yml | 5 ----- .github/workflows/tidy.yml | 5 ----- .gitmodules | 3 +++ conan-odr-index | 1 + 5 files changed, 4 insertions(+), 15 deletions(-) create mode 160000 conan-odr-index diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index ff02017b1..ee761e566 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -50,11 +50,6 @@ jobs: if: startsWith(matrix.host_profile, 'android') run: yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install 'ndk;${{ matrix.ndk_version }}' - - name: fetch conan-odr-index - uses: actions/checkout@v4 - with: - repository: opendocument-app/conan-odr-index - path: conan-odr-index - name: export conan-odr-index run: python conan-odr-index/scripts/conan_export_all_packages.py - name: conan config diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index dc56b6eba..bddfe3c9c 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -37,11 +37,6 @@ jobs: - name: get version run: echo "VERSION=${GITHUB_REF_NAME:1}" >> $GITHUB_ENV - - name: fetch conan-odr-index - uses: actions/checkout@v4 - with: - repository: opendocument-app/conan-odr-index - path: conan-odr-index - name: export conan-odr-index run: python conan-odr-index/scripts/conan_export_all_packages.py - name: conan config diff --git a/.github/workflows/tidy.yml b/.github/workflows/tidy.yml index 53d42de13..9157110f8 100644 --- a/.github/workflows/tidy.yml +++ b/.github/workflows/tidy.yml @@ -43,11 +43,6 @@ jobs: - name: install python dependencies run: pip install --upgrade pip conan - - name: fetch conan-odr-index - uses: actions/checkout@v4 - with: - repository: opendocument-app/conan-odr-index - path: conan-odr-index - name: export conan-odr-index run: python conan-odr-index/scripts/conan_export_all_packages.py - name: conan config diff --git a/.gitmodules b/.gitmodules index 1c9ed7bf5..b2dbf372f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,6 @@ [submodule "test/data/reference-output/odr-private"] path = test/data/reference-output/odr-private url = git@github.com:opendocument-app/OpenDocument.test-private.output.git +[submodule "conan-odr-index"] + path = conan-odr-index + url = git@github.com:opendocument-app/conan-odr-index.git diff --git a/conan-odr-index b/conan-odr-index new file mode 160000 index 000000000..984750333 --- /dev/null +++ b/conan-odr-index @@ -0,0 +1 @@ +Subproject commit 98475033331d51251df1785336600f9fbb5b2761 From d295f8044252eac59e522fbcadb16d5fb4b72300 Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Wed, 25 Mar 2026 20:56:17 +0100 Subject: [PATCH 2/4] Apply suggestions from code review Co-authored-by: Andreas Stefl --- .github/workflows/build_test.yml | 2 ++ .github/workflows/publish.yml | 2 ++ .github/workflows/tidy.yml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index ee761e566..27ca73783 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -27,6 +27,8 @@ jobs: steps: - name: checkout uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - name: checkout conan-odr-index + run: git submodule update --init --depth 1 conan-odr-index - name: ubuntu install ccache if: runner.os == 'Linux' diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index bddfe3c9c..276c8b19a 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -15,6 +15,8 @@ jobs: steps: - name: checkout uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - name: checkout conan-odr-index + run: git submodule update --init --depth 1 conan-odr-index - name: ubuntu install ccache if: runner.os == 'Linux' diff --git a/.github/workflows/tidy.yml b/.github/workflows/tidy.yml index 9157110f8..7534539f2 100644 --- a/.github/workflows/tidy.yml +++ b/.github/workflows/tidy.yml @@ -22,6 +22,8 @@ jobs: steps: - name: checkout uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + - name: checkout conan-odr-index + run: git submodule update --init --depth 1 conan-odr-index - name: ubuntu install ccache if: runner.os == 'Linux' From e81bd41d7d77e6423fba38dcaf41aae11e241734 Mon Sep 17 00:00:00 2001 From: Mathias Kub Date: Wed, 25 Mar 2026 21:08:08 +0100 Subject: [PATCH 3/4] Update URL for conan-odr-index submodule --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index b2dbf372f..75d5beb50 100644 --- a/.gitmodules +++ b/.gitmodules @@ -12,4 +12,4 @@ url = git@github.com:opendocument-app/OpenDocument.test-private.output.git [submodule "conan-odr-index"] path = conan-odr-index - url = git@github.com:opendocument-app/conan-odr-index.git + url = https://github.com/opendocument-app/OpenDocument.core.git From 1ae8205700788cfb73e20aa29b9876e50934d267 Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Wed, 25 Mar 2026 22:04:58 +0100 Subject: [PATCH 4/4] Apply suggestions from code review Co-authored-by: Andreas Stefl --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 75d5beb50..f60e96a52 100644 --- a/.gitmodules +++ b/.gitmodules @@ -12,4 +12,4 @@ url = git@github.com:opendocument-app/OpenDocument.test-private.output.git [submodule "conan-odr-index"] path = conan-odr-index - url = https://github.com/opendocument-app/OpenDocument.core.git + url = https://github.com/opendocument-app/conan-odr-index.git