diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index ff02017b1..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' @@ -50,11 +52,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..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' @@ -37,11 +39,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..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' @@ -43,11 +45,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..f60e96a52 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 = https://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