From b599e051b0d416d4db6490362db0a03b8202c36b Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Wed, 1 May 2024 18:50:56 +0200 Subject: [PATCH 1/4] upload binaries to conan repo --- .github/workflows/android_main.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/android_main.yml b/.github/workflows/android_main.yml index 7b3b567423ed..c244c7e3dd81 100644 --- a/.github/workflows/android_main.yml +++ b/.github/workflows/android_main.yml @@ -47,6 +47,8 @@ jobs: 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: conan login + run: conan user --remote odr --password ${{ secrets.ARTIFACTORY }} admin - name: tweak conan profile for build machine run: | @@ -59,6 +61,9 @@ jobs: - name: gradle run: ./gradlew assembleDebug lintProDebug lintLiteDebug --stacktrace + - name: upload binaries to conan repo + run: conan upload "*" --confirm --remote odr + - name: upload apks uses: actions/upload-artifact@v3 with: @@ -122,6 +127,8 @@ jobs: 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: conan login + run: conan user --remote odr --password ${{ secrets.ARTIFACTORY }} admin - name: tweak conan profile for build machine run: | @@ -179,6 +186,9 @@ jobs: test ! -f sorry_but_tests_are_failing + - name: upload binaries to conan repo + run: conan upload "*" --confirm --remote odr + - name: upload test results uses: actions/upload-artifact@v3 if: always() From 0b8ae296cd97dd01c53df73a07e8d3ee4a843ac6 Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Wed, 1 May 2024 19:06:11 +0200 Subject: [PATCH 2/4] upload all --- .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 c244c7e3dd81..112b52a6b0d4 100644 --- a/.github/workflows/android_main.yml +++ b/.github/workflows/android_main.yml @@ -62,7 +62,7 @@ jobs: run: ./gradlew assembleDebug lintProDebug lintLiteDebug --stacktrace - name: upload binaries to conan repo - run: conan upload "*" --confirm --remote odr + run: conan upload "*" --remote odr --confirm --all --no-overwrite recipe - name: upload apks uses: actions/upload-artifact@v3 @@ -187,7 +187,7 @@ jobs: test ! -f sorry_but_tests_are_failing - name: upload binaries to conan repo - run: conan upload "*" --confirm --remote odr + run: conan upload "*" --remote odr --confirm --all --no-overwrite recipe - name: upload test results uses: actions/upload-artifact@v3 From 72bdad9f5c72464949fffc5afbfc5cf05ef516d6 Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Wed, 1 May 2024 19:35:59 +0200 Subject: [PATCH 3/4] no overwrite all --- .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 112b52a6b0d4..b0d3157bceb5 100644 --- a/.github/workflows/android_main.yml +++ b/.github/workflows/android_main.yml @@ -62,7 +62,7 @@ jobs: run: ./gradlew assembleDebug lintProDebug lintLiteDebug --stacktrace - name: upload binaries to conan repo - run: conan upload "*" --remote odr --confirm --all --no-overwrite recipe + run: conan upload "*" --remote odr --confirm --all --no-overwrite all - name: upload apks uses: actions/upload-artifact@v3 @@ -187,7 +187,7 @@ jobs: test ! -f sorry_but_tests_are_failing - name: upload binaries to conan repo - run: conan upload "*" --remote odr --confirm --all --no-overwrite recipe + run: conan upload "*" --remote odr --confirm --all --no-overwrite all - name: upload test results uses: actions/upload-artifact@v3 From 47bc962af2a5e9b0a147eae4f5f83a925c19d582 Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Wed, 1 May 2024 19:50:42 +0200 Subject: [PATCH 4/4] reorder conan remotes --- .github/workflows/android_main.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/android_main.yml b/.github/workflows/android_main.yml index b0d3157bceb5..aa7a28de6319 100644 --- a/.github/workflows/android_main.yml +++ b/.github/workflows/android_main.yml @@ -45,8 +45,11 @@ jobs: - 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: conan remote + run: | + conan remote clean + conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan + conan remote add conancenter https://center.conan.io - name: conan login run: conan user --remote odr --password ${{ secrets.ARTIFACTORY }} admin @@ -125,8 +128,11 @@ jobs: - 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: conan remote + run: | + conan remote clean + conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan + conan remote add conancenter https://center.conan.io - name: conan login run: conan user --remote odr --password ${{ secrets.ARTIFACTORY }} admin