Skip to content

Commit 613fa17

Browse files
committed
fix tests
1 parent d6995d5 commit 613fa17

File tree

2 files changed

+8
-14
lines changed

2 files changed

+8
-14
lines changed

.github/workflows/android_main.yml

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,6 @@ jobs:
6767
path: app/build/reports/lint-results-*.html
6868
if-no-files-found: error
6969

70-
- name: Artifact dotconan2
71-
uses: actions/upload-artifact@v4
72-
with:
73-
name: dotconan2
74-
path: ~/.conan2
75-
if-no-files-found: error
76-
compression-level: 0
77-
include-hidden-files: true
78-
7970
test:
8071
runs-on: ubuntu-22.04
8172
needs: build
@@ -118,10 +109,13 @@ jobs:
118109
- name: install ndk
119110
run: echo "y" | sudo ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "ndk;${{ env.ndk_version }}"
120111

121-
- uses: actions/download-artifact@v4
122-
with:
123-
name: dotconan2
124-
path: ~/.conan2
112+
- name: conan remote
113+
run: |
114+
conan remote remove "*"
115+
conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan
116+
conan remote add conancenter https://center2.conan.io
117+
- name: conan profile
118+
run: conan profile detect
125119

126120
- name: Enable KVM group perms
127121
run: |

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ tasks.register('conanProfile', Copy) {
2323
deployer.set('conandeployer.py')
2424
deployerFolder.set(outputDirectory.get().asFile.toString() + "/assets/core")
2525
dependsOn(tasks.named('conanProfile'))
26-
conanExecutable.set('conan')
26+
conanExecutable.set('/Users/andreas/odr/venv/bin/conan')
2727
}
2828
}
2929

0 commit comments

Comments
 (0)