From 91412c4cb7d7941ffa717e3ea3bae30de94f076a Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Sat, 20 Apr 2024 21:44:58 +0200 Subject: [PATCH 01/33] fix ci build with core --- .github/workflows/android_main.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/android_main.yml b/.github/workflows/android_main.yml index 265edf780c48..721b9cee949d 100644 --- a/.github/workflows/android_main.yml +++ b/.github/workflows/android_main.yml @@ -33,11 +33,16 @@ jobs: python-version: 3.8 - name: install pip and conan - run: python -m pip install --upgrade pip conan - - name: conan revisions - run: conan config set general.revisions_enabled=1 - - name: conan repo - run: conan remote add odr https://odr.jfrog.io/artifactory/api/conan/odr-conan + run: python -m pip install --upgrade pip conan==1.* + + - name: checkout odr.core + uses: actions/checkout@v3 + with: + name: opendocument-app/OpenDocument.core + ref: v3.0.0 + path: ../OpenDocument.core + - name: conan + run: conan export ../OpenDocument.core odrcore/3.0.0@ - run: ./gradlew assembleDebug lintProDebug lintLiteDebug --stacktrace From a1771a1223f181205930c149195ba0dd94b3291c Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Sat, 20 Apr 2024 21:53:43 +0200 Subject: [PATCH 02/33] fix checkout; rm afterwards --- .github/workflows/android_main.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/android_main.yml b/.github/workflows/android_main.yml index 721b9cee949d..f76fce49c218 100644 --- a/.github/workflows/android_main.yml +++ b/.github/workflows/android_main.yml @@ -38,11 +38,13 @@ jobs: - name: checkout odr.core uses: actions/checkout@v3 with: - name: opendocument-app/OpenDocument.core + repository: opendocument-app/OpenDocument.core ref: v3.0.0 - path: ../OpenDocument.core + path: OpenDocument.core - name: conan - run: conan export ../OpenDocument.core odrcore/3.0.0@ + run: conan export OpenDocument.core odrcore/3.0.0@ + - name: remove odr.core + run: rm -rf OpenDocument.core - run: ./gradlew assembleDebug lintProDebug lintLiteDebug --stacktrace From 4b3511c4795971438f88b75f2cc3e5d57d679c7c Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Sat, 20 Apr 2024 21:58:08 +0200 Subject: [PATCH 03/33] bump java version --- .github/workflows/android_main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android_main.yml b/.github/workflows/android_main.yml index f76fce49c218..3418cdf783df 100644 --- a/.github/workflows/android_main.yml +++ b/.github/workflows/android_main.yml @@ -88,7 +88,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 11 + java-version: 17 - name: brew run: ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" < /dev/null 2> /dev/null From da64946fc5eadec84c865a2d9a8d37e2ebe5b148 Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Sat, 20 Apr 2024 22:00:25 +0200 Subject: [PATCH 04/33] fix build and test --- .github/workflows/android_main.yml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/.github/workflows/android_main.yml b/.github/workflows/android_main.yml index 3418cdf783df..48c0761e26d2 100644 --- a/.github/workflows/android_main.yml +++ b/.github/workflows/android_main.yml @@ -25,7 +25,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: 11 + java-version: 17 - name: set up python 3.8 uses: actions/setup-python@v4 @@ -59,6 +59,7 @@ jobs: name: lint-report path: app/build/reports/lint-results-*.html if-no-files-found: error + test: runs-on: macos-11 strategy: @@ -105,11 +106,18 @@ jobs: - name: pip run: python3 -m ensurepip - name: conan - run: pip3 install conan - - name: conan revisions - run: conan config set general.revisions_enabled=1 - - name: conan repo - run: conan remote add odr https://odr.jfrog.io/artifactory/api/conan/odr-conan + run: pip3 install --upgrade conan==1.* + + - name: checkout odr.core + uses: actions/checkout@v3 + with: + repository: opendocument-app/OpenDocument.core + ref: v3.0.0 + path: OpenDocument.core + - name: conan + run: conan export OpenDocument.core odrcore/3.0.0@ + - name: remove odr.core + run: rm -rf OpenDocument.core - name: Android Virtual Device (AVD) cache uses: actions/cache@v3 From 0589a30a075ae0b8b035591f9ebe5b38cd5d8930 Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Sat, 20 Apr 2024 22:18:25 +0200 Subject: [PATCH 05/33] fixfix --- .github/workflows/android_main.yml | 12 ++++++++++-- .../at/tomtasche/reader/background/PdfLoader.java | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/android_main.yml b/.github/workflows/android_main.yml index 48c0761e26d2..3b70fd21f39c 100644 --- a/.github/workflows/android_main.yml +++ b/.github/workflows/android_main.yml @@ -2,15 +2,23 @@ name: OpenDocument-Reader-Android on: workflow_dispatch: - pull_request: + push: paths-ignore: - '**.md' - push: + - '.github/**' + - '!.github/workflows/android_main.yml' + branches: + - main + pull_request: paths-ignore: - '**.md' - '.github/**' - '!.github/workflows/android_main.yml' +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} + cancel-in-progress: true + jobs: build: runs-on: ubuntu-20.04 diff --git a/app/src/main/java/at/tomtasche/reader/background/PdfLoader.java b/app/src/main/java/at/tomtasche/reader/background/PdfLoader.java index bef90c11941f..1df4fbae2d4e 100644 --- a/app/src/main/java/at/tomtasche/reader/background/PdfLoader.java +++ b/app/src/main/java/at/tomtasche/reader/background/PdfLoader.java @@ -47,7 +47,7 @@ public void loadSync(Options options) { File cacheDirectory = AndroidFileCache.getCacheDirectory(cacheFile); pdf2htmlEX pdfConverter = new pdf2htmlEX(context).setInputPDF(cacheFile); - pdfConverter.setOutline(false).setBackgroundFormat("jpg").setDRM(false); + pdfConverter.setBackgroundFormat("jpg").setDRM(false); pdfConverter.setProcessAnnotation(true); if (options.password != null) { pdfConverter.setOwnerPassword(options.password).setUserPassword(options.password); From 4b35a3a3cd206b3f7bcdb3f7e7fea97b38eb017b Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Sun, 21 Apr 2024 00:23:36 +0200 Subject: [PATCH 06/33] fix build --- CMakeLists.txt | 2 +- app/src/main/java/at/tomtasche/reader/background/PdfLoader.java | 2 +- conanfile.txt | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a7b5fcb113ee..286b3f8ff88c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,7 @@ configure_file(app/toolchain.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/toolchain.cmak conan_cmake_install(PATH_OR_REFERENCE ${CMAKE_CURRENT_LIST_DIR} BUILD missing SETTINGS ${settings} - PROFILE ${CMAKE_CURRENT_LIST_DIR}/conanprofile.txt + PROFILE_BUILD ${CMAKE_CURRENT_LIST_DIR}/conanprofile.txt ENV CONAN_CMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_BINARY_DIR}/toolchain.cmake) include(${CMAKE_CURRENT_BINARY_DIR}/conan_paths.cmake) diff --git a/app/src/main/java/at/tomtasche/reader/background/PdfLoader.java b/app/src/main/java/at/tomtasche/reader/background/PdfLoader.java index 1df4fbae2d4e..acc0775fcfee 100644 --- a/app/src/main/java/at/tomtasche/reader/background/PdfLoader.java +++ b/app/src/main/java/at/tomtasche/reader/background/PdfLoader.java @@ -47,7 +47,7 @@ public void loadSync(Options options) { File cacheDirectory = AndroidFileCache.getCacheDirectory(cacheFile); pdf2htmlEX pdfConverter = new pdf2htmlEX(context).setInputPDF(cacheFile); - pdfConverter.setBackgroundFormat("jpg").setDRM(false); + pdfConverter.setDRM(false); pdfConverter.setProcessAnnotation(true); if (options.password != null) { pdfConverter.setOwnerPassword(options.password).setUserPassword(options.password); diff --git a/conanfile.txt b/conanfile.txt index dde444cbcfed..a62701ffc648 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -5,4 +5,3 @@ odrcore/3.0.0@ cmake cmake_paths cmake_find_package - From 1217a6a9921f8c2b705076f28226428cb407f802 Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Sun, 21 Apr 2024 00:53:12 +0200 Subject: [PATCH 07/33] fix build? --- CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 286b3f8ff88c..3ce6778e64f9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,13 +23,15 @@ string(REPLACE "armeabi-v7a" "armv7" ARCH "${ARCH}") string(REPLACE "arm64-v8a" "armv8" ARCH "${ARCH}") include(${CMAKE_CURRENT_LIST_DIR}/app/conan.cmake) -conan_cmake_autodetect(settings ARCH ${ARCH}) +conan_cmake_autodetect(settings_build) +conan_cmake_autodetect(settings_host ARCH ${ARCH}) # inspired from here https://docs.conan.io/en/latest/integrations/cross_platform/android.html configure_file(app/toolchain.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/toolchain.cmake @ONLY) conan_cmake_install(PATH_OR_REFERENCE ${CMAKE_CURRENT_LIST_DIR} BUILD missing - SETTINGS ${settings} - PROFILE_BUILD ${CMAKE_CURRENT_LIST_DIR}/conanprofile.txt + SETTINGS_BUILD ${settings_build} + SETTINGS_HOST ${settings_host} + PROFILE_HOST ${CMAKE_CURRENT_LIST_DIR}/conanprofile.txt ENV CONAN_CMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_BINARY_DIR}/toolchain.cmake) include(${CMAKE_CURRENT_BINARY_DIR}/conan_paths.cmake) From e7ecd2c37a8c2e6723d16fe1d3b4715cb19bd235 Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Sun, 21 Apr 2024 02:15:07 +0200 Subject: [PATCH 08/33] runs locally --- CMakeLists.txt | 7 +++++-- app/src/main/cpp/CoreWrapper.cpp | 10 +++------- conanprofile.txt | 9 +++++++++ 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ce6778e64f9..af79d53b02d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,6 +23,7 @@ string(REPLACE "armeabi-v7a" "armv7" ARCH "${ARCH}") string(REPLACE "arm64-v8a" "armv8" ARCH "${ARCH}") include(${CMAKE_CURRENT_LIST_DIR}/app/conan.cmake) +conan_cmake_configure(GENERATORS cmake) conan_cmake_autodetect(settings_build) conan_cmake_autodetect(settings_host ARCH ${ARCH}) # inspired from here https://docs.conan.io/en/latest/integrations/cross_platform/android.html @@ -30,9 +31,11 @@ configure_file(app/toolchain.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/toolchain.cmak conan_cmake_install(PATH_OR_REFERENCE ${CMAKE_CURRENT_LIST_DIR} BUILD missing SETTINGS_BUILD ${settings_build} - SETTINGS_HOST ${settings_host} + SETTINGS_HOST ${settings_host} compiler.libcxx=c++_shared + PROFILE_BUILD default PROFILE_HOST ${CMAKE_CURRENT_LIST_DIR}/conanprofile.txt - ENV CONAN_CMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_BINARY_DIR}/toolchain.cmake) + ENV CONAN_CMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_BINARY_DIR}/toolchain.cmake + ANDROID_NDK_ROOT=${CMAKE_ANDROID_NDK}) include(${CMAKE_CURRENT_BINARY_DIR}/conan_paths.cmake) find_package(odr REQUIRED) diff --git a/app/src/main/cpp/CoreWrapper.cpp b/app/src/main/cpp/CoreWrapper.cpp index c9224a7e3aca..05d668dd1ce3 100644 --- a/app/src/main/cpp/CoreWrapper.cpp +++ b/app/src/main/cpp/CoreWrapper.cpp @@ -2,7 +2,6 @@ #include #include #include -#include #include #include #include @@ -114,12 +113,9 @@ Java_at_tomtasche_reader_background_CoreWrapper_parseNative(JNIEnv *env, jobject config.text_document_margin = true; } - const char* passwordC = nullptr; - if (passwordCpp.has_value()) { - passwordC = passwordCpp.value().c_str(); - } - - html = odr::OpenDocumentReader::html(inputPathCpp, passwordC, outputPathCpp, config); + html = odr::OpenDocumentReader::html(inputPathCpp, [&passwordCpp]() { + return passwordCpp.value().c_str(); + }, outputPathCpp, config); { const auto extensionCpp = odr::OpenDocumentReader::type_to_string( diff --git a/conanprofile.txt b/conanprofile.txt index e1162eecfb2f..aeabc89e6588 100644 --- a/conanprofile.txt +++ b/conanprofile.txt @@ -3,4 +3,13 @@ include(default) [settings] os=Android os.api_level=19 +compiler=clang +compiler.libcxx=c++_shared build_type=Release + +[env] +CONAN_RUN_TESTS=False +CONAN_CMAKE_GENERATOR=Ninja + +[conf] +tools.android:ndk_path=$ENV{ANDROID_NDK_ROOT} From 26ca5c67bf75ffeb58cf6f28e4b55d1c430d7f91 Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Sun, 21 Apr 2024 02:27:07 +0200 Subject: [PATCH 09/33] fix linux build? --- CMakeLists.txt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index af79d53b02d6..51cfdc69197b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,15 +24,12 @@ string(REPLACE "arm64-v8a" "armv8" ARCH "${ARCH}") include(${CMAKE_CURRENT_LIST_DIR}/app/conan.cmake) conan_cmake_configure(GENERATORS cmake) -conan_cmake_autodetect(settings_build) -conan_cmake_autodetect(settings_host ARCH ${ARCH}) +conan_cmake_autodetect(settings ARCH ${ARCH}) # inspired from here https://docs.conan.io/en/latest/integrations/cross_platform/android.html configure_file(app/toolchain.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/toolchain.cmake @ONLY) conan_cmake_install(PATH_OR_REFERENCE ${CMAKE_CURRENT_LIST_DIR} BUILD missing - SETTINGS_BUILD ${settings_build} - SETTINGS_HOST ${settings_host} compiler.libcxx=c++_shared - PROFILE_BUILD default + SETTINGS_HOST ${settings} compiler.libcxx=c++_shared PROFILE_HOST ${CMAKE_CURRENT_LIST_DIR}/conanprofile.txt ENV CONAN_CMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_BINARY_DIR}/toolchain.cmake ANDROID_NDK_ROOT=${CMAKE_ANDROID_NDK}) From adb6c58a1f0455ff463b098b6b8bee657f416a4a Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Sun, 21 Apr 2024 09:48:02 +0200 Subject: [PATCH 10/33] fix build; try disable package test build --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 51cfdc69197b..10cbb00ed821 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,6 +30,7 @@ configure_file(app/toolchain.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/toolchain.cmak conan_cmake_install(PATH_OR_REFERENCE ${CMAKE_CURRENT_LIST_DIR} BUILD missing SETTINGS_HOST ${settings} compiler.libcxx=c++_shared + PROFILE_BUILD default PROFILE_HOST ${CMAKE_CURRENT_LIST_DIR}/conanprofile.txt ENV CONAN_CMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_BINARY_DIR}/toolchain.cmake ANDROID_NDK_ROOT=${CMAKE_ANDROID_NDK}) From 62f7730f186aeceb3758fc822e3a8deb41e1de5f Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Sun, 21 Apr 2024 09:48:45 +0200 Subject: [PATCH 11/33] try disable package test build --- conanprofile.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/conanprofile.txt b/conanprofile.txt index aeabc89e6588..a3ab8ff0c37e 100644 --- a/conanprofile.txt +++ b/conanprofile.txt @@ -13,3 +13,4 @@ CONAN_CMAKE_GENERATOR=Ninja [conf] tools.android:ndk_path=$ENV{ANDROID_NDK_ROOT} +tools.build:skip_test=True From 87be0dd46b676c06d32f2e2552adbf4ef30b9157 Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Sun, 21 Apr 2024 09:57:34 +0200 Subject: [PATCH 12/33] use core version 4 --- .github/workflows/android_main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android_main.yml b/.github/workflows/android_main.yml index 3b70fd21f39c..fa122cff7475 100644 --- a/.github/workflows/android_main.yml +++ b/.github/workflows/android_main.yml @@ -47,10 +47,10 @@ jobs: uses: actions/checkout@v3 with: repository: opendocument-app/OpenDocument.core - ref: v3.0.0 + ref: v4.0.0 path: OpenDocument.core - name: conan - run: conan export OpenDocument.core odrcore/3.0.0@ + run: conan export OpenDocument.core odrcore/4.0.0@ - name: remove odr.core run: rm -rf OpenDocument.core From 508adf3c8c9b512a9222d3c31290a7df348634df Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Sun, 21 Apr 2024 10:01:40 +0200 Subject: [PATCH 13/33] revert to v3 --- .github/workflows/android_main.yml | 4 ++-- app/src/main/cpp/CoreWrapper.cpp | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/android_main.yml b/.github/workflows/android_main.yml index fa122cff7475..3b70fd21f39c 100644 --- a/.github/workflows/android_main.yml +++ b/.github/workflows/android_main.yml @@ -47,10 +47,10 @@ jobs: uses: actions/checkout@v3 with: repository: opendocument-app/OpenDocument.core - ref: v4.0.0 + ref: v3.0.0 path: OpenDocument.core - name: conan - run: conan export OpenDocument.core odrcore/4.0.0@ + run: conan export OpenDocument.core odrcore/3.0.0@ - name: remove odr.core run: rm -rf OpenDocument.core diff --git a/app/src/main/cpp/CoreWrapper.cpp b/app/src/main/cpp/CoreWrapper.cpp index 05d668dd1ce3..c9224a7e3aca 100644 --- a/app/src/main/cpp/CoreWrapper.cpp +++ b/app/src/main/cpp/CoreWrapper.cpp @@ -2,6 +2,7 @@ #include #include #include +#include #include #include #include @@ -113,9 +114,12 @@ Java_at_tomtasche_reader_background_CoreWrapper_parseNative(JNIEnv *env, jobject config.text_document_margin = true; } - html = odr::OpenDocumentReader::html(inputPathCpp, [&passwordCpp]() { - return passwordCpp.value().c_str(); - }, outputPathCpp, config); + const char* passwordC = nullptr; + if (passwordCpp.has_value()) { + passwordC = passwordCpp.value().c_str(); + } + + html = odr::OpenDocumentReader::html(inputPathCpp, passwordC, outputPathCpp, config); { const auto extensionCpp = odr::OpenDocumentReader::type_to_string( From 65e0a74ccdbe8272ff127bfb718463ebf0072552 Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Sun, 21 Apr 2024 10:08:55 +0200 Subject: [PATCH 14/33] fix CoreWrapper --- app/src/main/cpp/CoreWrapper.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/src/main/cpp/CoreWrapper.cpp b/app/src/main/cpp/CoreWrapper.cpp index c9224a7e3aca..9a5aba3d3b70 100644 --- a/app/src/main/cpp/CoreWrapper.cpp +++ b/app/src/main/cpp/CoreWrapper.cpp @@ -1,15 +1,16 @@ #include "CoreWrapper.h" -#include -#include + #include -#include -#include #include #include #include #include + #include +#include +#include + std::optional html; JNIEXPORT jobject JNICALL From 5f6eb3c5dacd8cc6a71e6682a7b3ee6d27c59d0d Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Sun, 21 Apr 2024 10:27:06 +0200 Subject: [PATCH 15/33] try force build machine libcxx --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 10cbb00ed821..291d9390fd89 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,6 +29,7 @@ conan_cmake_autodetect(settings ARCH ${ARCH}) configure_file(app/toolchain.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/toolchain.cmake @ONLY) conan_cmake_install(PATH_OR_REFERENCE ${CMAKE_CURRENT_LIST_DIR} BUILD missing + SETTINGS_BUILD compiler.libcxx=libc++ SETTINGS_HOST ${settings} compiler.libcxx=c++_shared PROFILE_BUILD default PROFILE_HOST ${CMAKE_CURRENT_LIST_DIR}/conanprofile.txt From 3b86a1c32d32a9f72fc5600993cc8b547ef1f73b Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Sun, 21 Apr 2024 10:40:18 +0200 Subject: [PATCH 16/33] try again --- CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 291d9390fd89..f2ca9a030ee5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,13 +24,14 @@ string(REPLACE "arm64-v8a" "armv8" ARCH "${ARCH}") include(${CMAKE_CURRENT_LIST_DIR}/app/conan.cmake) conan_cmake_configure(GENERATORS cmake) -conan_cmake_autodetect(settings ARCH ${ARCH}) +conan_cmake_autodetect(settings_build) +conan_cmake_autodetect(settings_host ARCH ${ARCH}) # inspired from here https://docs.conan.io/en/latest/integrations/cross_platform/android.html configure_file(app/toolchain.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/toolchain.cmake @ONLY) conan_cmake_install(PATH_OR_REFERENCE ${CMAKE_CURRENT_LIST_DIR} BUILD missing - SETTINGS_BUILD compiler.libcxx=libc++ - SETTINGS_HOST ${settings} compiler.libcxx=c++_shared + SETTINGS_BUILD ${settings_build} compiler.libcxx=libc++ + SETTINGS_HOST ${settings_host} compiler.libcxx=c++_shared PROFILE_BUILD default PROFILE_HOST ${CMAKE_CURRENT_LIST_DIR}/conanprofile.txt ENV CONAN_CMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_BINARY_DIR}/toolchain.cmake From 74f7d3f283820b68f6451596c8306f3267daa331 Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Sun, 21 Apr 2024 11:05:26 +0200 Subject: [PATCH 17/33] try again --- CMakeLists.txt | 7 ++----- conanprofile_build.txt | 13 +++++++++++++ conanprofile.txt => conanprofile_host.txt | 0 3 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 conanprofile_build.txt rename conanprofile.txt => conanprofile_host.txt (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index f2ca9a030ee5..b08b254110a2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,17 +23,14 @@ string(REPLACE "armeabi-v7a" "armv7" ARCH "${ARCH}") string(REPLACE "arm64-v8a" "armv8" ARCH "${ARCH}") include(${CMAKE_CURRENT_LIST_DIR}/app/conan.cmake) -conan_cmake_configure(GENERATORS cmake) -conan_cmake_autodetect(settings_build) conan_cmake_autodetect(settings_host ARCH ${ARCH}) # inspired from here https://docs.conan.io/en/latest/integrations/cross_platform/android.html configure_file(app/toolchain.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/toolchain.cmake @ONLY) conan_cmake_install(PATH_OR_REFERENCE ${CMAKE_CURRENT_LIST_DIR} BUILD missing - SETTINGS_BUILD ${settings_build} compiler.libcxx=libc++ SETTINGS_HOST ${settings_host} compiler.libcxx=c++_shared - PROFILE_BUILD default - PROFILE_HOST ${CMAKE_CURRENT_LIST_DIR}/conanprofile.txt + PROFILE_BUILD ${CMAKE_CURRENT_LIST_DIR}/conanprofile_build.txt + PROFILE_HOST ${CMAKE_CURRENT_LIST_DIR}/conanprofile_host.txt ENV CONAN_CMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_BINARY_DIR}/toolchain.cmake ANDROID_NDK_ROOT=${CMAKE_ANDROID_NDK}) include(${CMAKE_CURRENT_BINARY_DIR}/conan_paths.cmake) diff --git a/conanprofile_build.txt b/conanprofile_build.txt new file mode 100644 index 000000000000..7d80aa8d7384 --- /dev/null +++ b/conanprofile_build.txt @@ -0,0 +1,13 @@ +include(default) + +[settings] +compiler=clang +compiler.libcxx=libc++ +build_type=Release + +[env] +CONAN_RUN_TESTS=False +CONAN_CMAKE_GENERATOR=Ninja + +[conf] +tools.build:skip_test=True diff --git a/conanprofile.txt b/conanprofile_host.txt similarity index 100% rename from conanprofile.txt rename to conanprofile_host.txt From cf7ec0919c7abdbe341202844802b905960001e9 Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Sun, 21 Apr 2024 11:22:57 +0200 Subject: [PATCH 18/33] try again --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b08b254110a2..747ba51c3622 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,7 +31,8 @@ conan_cmake_install(PATH_OR_REFERENCE ${CMAKE_CURRENT_LIST_DIR} SETTINGS_HOST ${settings_host} compiler.libcxx=c++_shared PROFILE_BUILD ${CMAKE_CURRENT_LIST_DIR}/conanprofile_build.txt PROFILE_HOST ${CMAKE_CURRENT_LIST_DIR}/conanprofile_host.txt - ENV CONAN_CMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_BINARY_DIR}/toolchain.cmake + ENV_HOST + CONAN_CMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_BINARY_DIR}/toolchain.cmake ANDROID_NDK_ROOT=${CMAKE_ANDROID_NDK}) include(${CMAKE_CURRENT_BINARY_DIR}/conan_paths.cmake) From 0956504aa13b1b47d9c7369514d538a98f36ac5c Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Sun, 21 Apr 2024 11:32:28 +0200 Subject: [PATCH 19/33] try again --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 747ba51c3622..c2b6c30ac2f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,6 +31,9 @@ conan_cmake_install(PATH_OR_REFERENCE ${CMAKE_CURRENT_LIST_DIR} SETTINGS_HOST ${settings_host} compiler.libcxx=c++_shared PROFILE_BUILD ${CMAKE_CURRENT_LIST_DIR}/conanprofile_build.txt PROFILE_HOST ${CMAKE_CURRENT_LIST_DIR}/conanprofile_host.txt + ENV_BUILD + CC=${CMAKE_C_COMPILER} + CXX=${CMAKE_CXX_COMPILER} ENV_HOST CONAN_CMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_BINARY_DIR}/toolchain.cmake ANDROID_NDK_ROOT=${CMAKE_ANDROID_NDK}) From 87fb654ff34e5a6a947d1a552e7aeff7749f8505 Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Sun, 21 Apr 2024 11:40:44 +0200 Subject: [PATCH 20/33] try again --- conanprofile_build.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/conanprofile_build.txt b/conanprofile_build.txt index 7d80aa8d7384..03fa0a5ddbbc 100644 --- a/conanprofile_build.txt +++ b/conanprofile_build.txt @@ -1,8 +1,6 @@ include(default) -[settings] -compiler=clang -compiler.libcxx=libc++ +[settings]s build_type=Release [env] From 74b3b1a53f4ee1ae2f94fe8d06463e1ec5ee9c2e Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Sun, 21 Apr 2024 11:54:59 +0200 Subject: [PATCH 21/33] try again --- conanprofile_build.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/conanprofile_build.txt b/conanprofile_build.txt index 03fa0a5ddbbc..7d80aa8d7384 100644 --- a/conanprofile_build.txt +++ b/conanprofile_build.txt @@ -1,6 +1,8 @@ include(default) -[settings]s +[settings] +compiler=clang +compiler.libcxx=libc++ build_type=Release [env] From 56fa0b33dfcb9768ff1879a16dda76304384602e Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Sun, 21 Apr 2024 12:24:16 +0200 Subject: [PATCH 22/33] try again --- .github/workflows/android_main.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/android_main.yml b/.github/workflows/android_main.yml index 3b70fd21f39c..53225a5be50e 100644 --- a/.github/workflows/android_main.yml +++ b/.github/workflows/android_main.yml @@ -53,6 +53,8 @@ jobs: run: conan export OpenDocument.core odrcore/3.0.0@ - name: remove odr.core run: rm -rf OpenDocument.core + - name: conan install odr.core + run: conan install odrcore/3.0.0@ - run: ./gradlew assembleDebug lintProDebug lintLiteDebug --stacktrace @@ -126,6 +128,8 @@ jobs: run: conan export OpenDocument.core odrcore/3.0.0@ - name: remove odr.core run: rm -rf OpenDocument.core + - name: conan install odr.core + run: conan install odrcore/3.0.0@ - name: Android Virtual Device (AVD) cache uses: actions/cache@v3 From 2a00300cf75574ea1b681d25881248f9def37a57 Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Sun, 21 Apr 2024 12:27:48 +0200 Subject: [PATCH 23/33] build missing --- .github/workflows/android_main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android_main.yml b/.github/workflows/android_main.yml index 53225a5be50e..b28ec6985dac 100644 --- a/.github/workflows/android_main.yml +++ b/.github/workflows/android_main.yml @@ -54,7 +54,7 @@ jobs: - name: remove odr.core run: rm -rf OpenDocument.core - name: conan install odr.core - run: conan install odrcore/3.0.0@ + run: conan install odrcore/3.0.0@ --build missing - run: ./gradlew assembleDebug lintProDebug lintLiteDebug --stacktrace @@ -129,7 +129,7 @@ jobs: - name: remove odr.core run: rm -rf OpenDocument.core - name: conan install odr.core - run: conan install odrcore/3.0.0@ + run: conan install odrcore/3.0.0@ --build missing - name: Android Virtual Device (AVD) cache uses: actions/cache@v3 From a181720f88982a03dd4c356fcb6882df95636b8a Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Sun, 21 Apr 2024 12:35:29 +0200 Subject: [PATCH 24/33] try again --- .github/workflows/android_main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android_main.yml b/.github/workflows/android_main.yml index b28ec6985dac..36b17fe883f7 100644 --- a/.github/workflows/android_main.yml +++ b/.github/workflows/android_main.yml @@ -54,7 +54,7 @@ jobs: - name: remove odr.core run: rm -rf OpenDocument.core - name: conan install odr.core - run: conan install odrcore/3.0.0@ --build missing + run: conan install odrcore/3.0.0@ --build missing -s compiler=clang - run: ./gradlew assembleDebug lintProDebug lintLiteDebug --stacktrace From a223ce66dd89c08d7e13537f94916fd4c476556c Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Sun, 21 Apr 2024 12:46:15 +0200 Subject: [PATCH 25/33] try again --- .github/workflows/android_main.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/android_main.yml b/.github/workflows/android_main.yml index 36b17fe883f7..84222ae67a81 100644 --- a/.github/workflows/android_main.yml +++ b/.github/workflows/android_main.yml @@ -54,7 +54,10 @@ jobs: - name: remove odr.core run: rm -rf OpenDocument.core - name: conan install odr.core - run: conan install odrcore/3.0.0@ --build missing -s compiler=clang + run: conan install odrcore/3.0.0@ --build missing + env: + CC: clang + CXX: clang++ - run: ./gradlew assembleDebug lintProDebug lintLiteDebug --stacktrace From b070abe3ffa67c097ce7a12bf9a47cd4b72e9808 Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Sun, 21 Apr 2024 12:54:43 +0200 Subject: [PATCH 26/33] try again --- .github/workflows/android_main.yml | 36 +++++++++++++++++------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/.github/workflows/android_main.yml b/.github/workflows/android_main.yml index 84222ae67a81..fe134832e698 100644 --- a/.github/workflows/android_main.yml +++ b/.github/workflows/android_main.yml @@ -27,15 +27,15 @@ jobs: - name: checkout uses: actions/checkout@v3 - - name: ninja + - name: install ninja run: sudo apt-get install -y ninja-build - - name: java + - name: setup java uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: 17 - - name: set up python 3.8 + - name: setup python 3.8 uses: actions/setup-python@v4 with: python-version: 3.8 @@ -49,25 +49,28 @@ jobs: repository: opendocument-app/OpenDocument.core ref: v3.0.0 path: OpenDocument.core - - name: conan + - name: conan export odr.core run: conan export OpenDocument.core odrcore/3.0.0@ - name: remove odr.core run: rm -rf OpenDocument.core - name: conan install odr.core - run: conan install odrcore/3.0.0@ --build missing + run: conan install odrcore/3.0.0@ --build missing -s compiler=clang -s compiler.libcxx=libc++ env: CC: clang CXX: clang++ - - run: ./gradlew assembleDebug lintProDebug lintLiteDebug --stacktrace + - name: gradel + run: ./gradlew assembleDebug lintProDebug lintLiteDebug --stacktrace - - uses: actions/upload-artifact@v3 + - name: upload apks + uses: actions/upload-artifact@v3 with: name: APKs path: app/build/outputs/apk/**/*.apk if-no-files-found: error - - uses: actions/upload-artifact@v3 + - name: upload lint results + uses: actions/upload-artifact@v3 with: name: lint-report path: app/build/reports/lint-results-*.html @@ -104,21 +107,21 @@ jobs: distribution: 'zulu' java-version: 17 - - name: brew + - name: install brew run: ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" < /dev/null 2> /dev/null - name: fix ninja install run: rm '/usr/local/bin/2to3' - - name: ninja + - name: install ninja run: brew install ninja # https://stackoverflow.com/a/57758679/198996 - - name: bundler + - name: install bundler run: gem install bundler:1.17.3 - - name: fastlane + - name: install fastlane run: bundle install - - name: pip + - name: install pip run: python3 -m ensurepip - - name: conan + - name: install conan run: pip3 install --upgrade conan==1.* - name: checkout odr.core @@ -127,7 +130,7 @@ jobs: repository: opendocument-app/OpenDocument.core ref: v3.0.0 path: OpenDocument.core - - name: conan + - name: conan export odr.core run: conan export OpenDocument.core odrcore/3.0.0@ - name: remove odr.core run: rm -rf OpenDocument.core @@ -182,7 +185,8 @@ jobs: test ! -f sorry_but_tests_are_failing - - uses: actions/upload-artifact@v3 + - name: upload test results + uses: actions/upload-artifact@v3 if: always() with: name: testResults-${{ matrix.api-level }}-${{ matrix.arch }} From 1bbea67426ec97d6592a09fa9b4266da8f07da8c Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Sun, 21 Apr 2024 12:57:24 +0200 Subject: [PATCH 27/33] try again --- .github/workflows/android_main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android_main.yml b/.github/workflows/android_main.yml index fe134832e698..f0670df32f8e 100644 --- a/.github/workflows/android_main.yml +++ b/.github/workflows/android_main.yml @@ -54,7 +54,7 @@ jobs: - name: remove odr.core run: rm -rf OpenDocument.core - name: conan install odr.core - run: conan install odrcore/3.0.0@ --build missing -s compiler=clang -s compiler.libcxx=libc++ + run: conan install odrcore/3.0.0@ --build missing -s compiler=clang -s compiler.libcxx=libstdc++11 env: CC: clang CXX: clang++ From f920cc43e8bc8eb8b30c0f4917b8b1971406761d Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Sun, 21 Apr 2024 13:26:33 +0200 Subject: [PATCH 28/33] try again --- .github/workflows/android_main.yml | 2 +- conanprofile_build.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android_main.yml b/.github/workflows/android_main.yml index f0670df32f8e..8d189b0f6dc9 100644 --- a/.github/workflows/android_main.yml +++ b/.github/workflows/android_main.yml @@ -59,7 +59,7 @@ jobs: CC: clang CXX: clang++ - - name: gradel + - name: gradle run: ./gradlew assembleDebug lintProDebug lintLiteDebug --stacktrace - name: upload apks diff --git a/conanprofile_build.txt b/conanprofile_build.txt index 7d80aa8d7384..ac18f09a5f98 100644 --- a/conanprofile_build.txt +++ b/conanprofile_build.txt @@ -2,7 +2,7 @@ include(default) [settings] compiler=clang -compiler.libcxx=libc++ +compiler.libcxx=libstdc++11 build_type=Release [env] From f183eda61693be21e310b6eb6c0218762456473e Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Sun, 21 Apr 2024 13:49:48 +0200 Subject: [PATCH 29/33] try again --- .github/workflows/android_main.yml | 7 ------- conanprofile_build.txt | 2 -- 2 files changed, 9 deletions(-) diff --git a/.github/workflows/android_main.yml b/.github/workflows/android_main.yml index 8d189b0f6dc9..2f950268ed8a 100644 --- a/.github/workflows/android_main.yml +++ b/.github/workflows/android_main.yml @@ -53,11 +53,6 @@ jobs: run: conan export OpenDocument.core odrcore/3.0.0@ - name: remove odr.core run: rm -rf OpenDocument.core - - name: conan install odr.core - run: conan install odrcore/3.0.0@ --build missing -s compiler=clang -s compiler.libcxx=libstdc++11 - env: - CC: clang - CXX: clang++ - name: gradle run: ./gradlew assembleDebug lintProDebug lintLiteDebug --stacktrace @@ -134,8 +129,6 @@ jobs: run: conan export OpenDocument.core odrcore/3.0.0@ - name: remove odr.core run: rm -rf OpenDocument.core - - name: conan install odr.core - run: conan install odrcore/3.0.0@ --build missing - name: Android Virtual Device (AVD) cache uses: actions/cache@v3 diff --git a/conanprofile_build.txt b/conanprofile_build.txt index ac18f09a5f98..b0b4359ab469 100644 --- a/conanprofile_build.txt +++ b/conanprofile_build.txt @@ -1,8 +1,6 @@ include(default) [settings] -compiler=clang -compiler.libcxx=libstdc++11 build_type=Release [env] From 2b5542af93dbf6cff25885fe1be9e361417634ce Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Sun, 21 Apr 2024 14:51:53 +0200 Subject: [PATCH 30/33] try again --- .github/workflows/android_main.yml | 16 ++++++++++++++++ CMakeLists.txt | 3 --- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.github/workflows/android_main.yml b/.github/workflows/android_main.yml index 2f950268ed8a..2984e8a7a164 100644 --- a/.github/workflows/android_main.yml +++ b/.github/workflows/android_main.yml @@ -54,6 +54,14 @@ jobs: - name: remove odr.core run: rm -rf OpenDocument.core + - name: tweak conan profile for build machine + run: | + echo "" >> conanprofile_build.txt + echo "[settings]" >> conanprofile_build.txt + echo "compiler=clang" >> conanprofile_build.txt + echo "compiler.libcxx=libstdc++11" >> conanprofile_build.txt + echo "" >> conanprofile_build.txt + - name: gradle run: ./gradlew assembleDebug lintProDebug lintLiteDebug --stacktrace @@ -130,6 +138,14 @@ jobs: - name: remove odr.core run: rm -rf OpenDocument.core + - name: tweak conan profile for build machine + run: | + echo "" >> conanprofile_build.txt + echo "[settings]" >> conanprofile_build.txt + echo "compiler=clang" >> conanprofile_build.txt + echo "compiler.libcxx=libc++" >> conanprofile_build.txt + echo "" >> conanprofile_build.txt + - name: Android Virtual Device (AVD) cache uses: actions/cache@v3 id: avd-cache diff --git a/CMakeLists.txt b/CMakeLists.txt index c2b6c30ac2f4..747ba51c3622 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,9 +31,6 @@ conan_cmake_install(PATH_OR_REFERENCE ${CMAKE_CURRENT_LIST_DIR} SETTINGS_HOST ${settings_host} compiler.libcxx=c++_shared PROFILE_BUILD ${CMAKE_CURRENT_LIST_DIR}/conanprofile_build.txt PROFILE_HOST ${CMAKE_CURRENT_LIST_DIR}/conanprofile_host.txt - ENV_BUILD - CC=${CMAKE_C_COMPILER} - CXX=${CMAKE_CXX_COMPILER} ENV_HOST CONAN_CMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_BINARY_DIR}/toolchain.cmake ANDROID_NDK_ROOT=${CMAKE_ANDROID_NDK}) From e7ebeda63905df47af858b197173cca193bae4af Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Sun, 21 Apr 2024 16:54:29 +0200 Subject: [PATCH 31/33] drop 19 --- .github/workflows/android_main.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/android_main.yml b/.github/workflows/android_main.yml index 2984e8a7a164..6ac45f5c4628 100644 --- a/.github/workflows/android_main.yml +++ b/.github/workflows/android_main.yml @@ -86,9 +86,6 @@ jobs: # Make sure the matrix here and in cache_AVD_images.yml is the same matrix: include: - # Oldest version we support - - arch: x86 - api-level: 19 # Oldest x86_64 - arch: x86_64 api-level: 21 From 77a191dbb642f6fd7f879943f5adfe71fec576ee Mon Sep 17 00:00:00 2001 From: Thomas Taschauer Date: Fri, 26 Apr 2024 22:48:55 +0200 Subject: [PATCH 32/33] improve conan setup documentation --- CMakeLists.txt | 5 ++++- README.md | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 747ba51c3622..95525b70f043 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,10 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) -# make sure "which conan" points to a version of 1.x +# create virtual environment in project root and "pip install conan==1.*" +set(CMAKE_PREFIX_PATH "${CMAKE_CURRENT_LIST_DIR}/bin") +# or make sure "which conan" points to a version of 1.x + # TODO: call FIND_PROGRAM(conan) here manually so the location is cached for later # TODO: use proper virtual environment diff --git a/README.md b/README.md index 91bb0f0875e8..73f0b23ba3e1 100644 --- a/README.md +++ b/README.md @@ -11,3 +11,7 @@ Feel free to use it in your own project too, but please don't forget to tell us height="80">](https://play.google.com/store/apps/details?id=at.tomtasche.reader) More information at http://reader.tomtasche.at/ and in the app itself. + +## Setup + +- `conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan` \ No newline at end of file From deddc05ae6ac5ed1d12633883e032e2e9cfb08b3 Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Sat, 27 Apr 2024 14:30:26 +0200 Subject: [PATCH 33/33] use new shiny artifactory instance --- .github/workflows/android_main.yml | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/.github/workflows/android_main.yml b/.github/workflows/android_main.yml index 6ac45f5c4628..7b3b567423ed 100644 --- a/.github/workflows/android_main.yml +++ b/.github/workflows/android_main.yml @@ -43,16 +43,10 @@ jobs: - name: install pip and conan run: python -m pip install --upgrade pip conan==1.* - - name: checkout odr.core - uses: actions/checkout@v3 - with: - repository: opendocument-app/OpenDocument.core - ref: v3.0.0 - path: OpenDocument.core - - name: conan export odr.core - run: conan export OpenDocument.core odrcore/3.0.0@ - - name: remove odr.core - run: rm -rf OpenDocument.core + - name: conan config + run: conan config set general.revisions_enabled=1 + - name: conan repo + run: conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan - name: tweak conan profile for build machine run: | @@ -124,16 +118,10 @@ jobs: - name: install conan run: pip3 install --upgrade conan==1.* - - name: checkout odr.core - uses: actions/checkout@v3 - with: - repository: opendocument-app/OpenDocument.core - ref: v3.0.0 - path: OpenDocument.core - - name: conan export odr.core - run: conan export OpenDocument.core odrcore/3.0.0@ - - name: remove odr.core - run: rm -rf OpenDocument.core + - name: conan config + run: conan config set general.revisions_enabled=1 + - name: conan repo + run: conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan - name: tweak conan profile for build machine run: |