Skip to content

Commit 70a0888

Browse files
committed
build android in ci
1 parent 59be51e commit 70a0888

2 files changed

Lines changed: 27 additions & 25 deletions

File tree

.github/config/ubuntu-24.04-gcc-14/conan/profiles/default

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ compiler.libcxx=libstdc++11
88
os=Linux
99

1010
[conf]
11-
tools.build:compiler_executables={'c': 'gcc-14', 'cpp': 'g++-14'}
11+
tools.build:compiler_executables={'c': 'gcc-14', 'cpp': 'g++-14'}

.github/workflows/build_test.yml

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@ jobs:
1818
fail-fast: false
1919
matrix:
2020
include:
21-
- { os: ubuntu-24.04, compiler: clang-18 }
22-
- { os: ubuntu-24.04, compiler: gcc-14 }
23-
- { os: macos-13, compiler: clang-14 }
24-
- { os: macos-14, compiler: armv8-clang-14 }
25-
- { os: windows-2022, compiler: msvc-1940 }
21+
- { os: ubuntu-24.04, config: ubuntu-24.04-clang-18 }
22+
- { os: ubuntu-24.04, config: ubuntu-24.04-gcc-14 }
23+
- { os: macos-13, config: macos-13-clang-14 }
24+
- { os: macos-14, config: macos-14-armv8-clang-14 }
25+
- { os: windows-2022, config: windows-2022-msvc-1940 }
26+
- { os: android-35, config: android-35-x86_64 }
2627
steps:
2728
- name: checkout
2829
uses: actions/checkout@v4
@@ -51,7 +52,7 @@ jobs:
5152
conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan
5253
conan remote add conancenter https://center2.conan.io
5354
- name: conan config
54-
run: conan config install .github/config/${{ matrix.os }}-${{ matrix.compiler }}/conan
55+
run: conan config install .github/config/${{ matrix.config }}/conan
5556
- name: conan install
5657
run: conan install . --output-folder=build --build=missing
5758

@@ -61,9 +62,9 @@ jobs:
6162
path: |
6263
~/.ccache
6364
/Users/runner/Library/Caches/ccache
64-
key: ${{ matrix.os }}-${{ matrix.compiler }}-${{ env.CCACHE_KEY_SUFFIX }}
65+
key: ${{ matrix.config }}-${{ env.CCACHE_KEY_SUFFIX }}
6566
restore-keys: |
66-
${{ matrix.os }}-${{ matrix.compiler }}-
67+
${{ matrix.config }}-
6768
6869
- name: cmake
6970
if: runner.os != 'Windows'
@@ -99,7 +100,7 @@ jobs:
99100
- name: upload binaries to github
100101
uses: actions/upload-artifact@v4
101102
with:
102-
name: bin-${{ matrix.os }}-${{ matrix.compiler }}
103+
name: bin-${{ matrix.config }}
103104
path: |
104105
install
105106
build/test/odr_test
@@ -109,7 +110,7 @@ jobs:
109110
- name: Artifact .conan2/p dir
110111
uses: actions/upload-artifact@v4
111112
with:
112-
name: conan2-${{ matrix.os }}-${{ matrix.compiler }}
113+
name: conan2-${{ matrix.config }}
113114
path: ~/.conan2/p
114115
if-no-files-found: error
115116
compression-level: 0
@@ -156,7 +157,7 @@ jobs:
156157
- name: download binaries
157158
uses: actions/download-artifact@v4
158159
with:
159-
name: bin-${{ matrix.os }}-${{ matrix.compiler }}
160+
name: bin-${{ matrix.config }}
160161
path: cli
161162

162163
- name: Build and push
@@ -179,14 +180,14 @@ jobs:
179180
matrix:
180181
include:
181182
# fails at the moment because of pdf2htmlex
182-
#- { os: ubuntu-24.04, compiler: clang-18 }
183-
#- { os: ubuntu-24.04, compiler: gcc-14 }
184-
#- { os: macos-13, compiler: clang-14 }
185-
- { os: macos-14, compiler: armv8-clang-14 }
183+
#- { os: ubuntu-24.04, config: ubuntu-24.04-clang-18 }
184+
#- { os: ubuntu-24.04, config: ubuntu-24.04-gcc-14 }
185+
#- { os: macos-13, config: macos-13-clang-14 }
186+
- { os: macos-14, config: macos-14-armv8-clang-14 }
186187
# Windows test disabled because:
187188
# Running main() from C:\Users\runneradmin\.conan2\p\b\gtestdd9407d368b89\b\src\googletest\src\gtest_main.cc
188189
# [ FATAL ] C:/Users/runneradmin/.conan2/p/gtest28fa6787e7f6e/p/include\gtest/internal/gtest-param-util.h(585):: Condition IsValidParamName(param_name) failed. Parameterized test name 'odr_private\docx\03_smpldap_docx' is invalid, in D:\a\OpenDocument.core\OpenDocument.core\test\src\html_output_test.cpp line 129
189-
# - { os: windows-2022, compiler: msvc-1940 }
190+
#- { os: windows-2022, config: windows-2022-msvc-1940 }
190191
steps:
191192
- name: checkout
192193
uses: actions/checkout@v4
@@ -211,13 +212,13 @@ jobs:
211212
- name: download binaries
212213
uses: actions/download-artifact@v4
213214
with:
214-
name: bin-${{ matrix.os }}-${{ matrix.compiler }}
215+
name: bin-${{ matrix.config }}
215216
path: .
216217

217218
- name: Download .conan2/p dir
218219
uses: actions/download-artifact@v4
219220
with:
220-
name: conan2-${{ matrix.os }}-${{ matrix.compiler }}
221+
name: conan2-${{ matrix.config }}
221222
path: ~/.conan2/p
222223

223224
- name: fix artifact permissions
@@ -264,11 +265,12 @@ jobs:
264265
fail-fast: false
265266
matrix:
266267
include:
267-
- { os: ubuntu-24.04, compiler: clang-18 }
268-
- { os: ubuntu-24.04, compiler: gcc-14 }
269-
- { os: macos-13, compiler: clang-14 }
270-
- { os: macos-14, compiler: armv8-clang-14 }
271-
- { os: windows-2022, compiler: msvc-1940 }
268+
- { os: ubuntu-24.04, config: ubuntu-24.04-clang-18 }
269+
- { os: ubuntu-24.04, config: ubuntu-24.04-gcc-14 }
270+
- { os: macos-13, config: macos-13-clang-14 }
271+
- { os: macos-14, config: macos-14-armv8-clang-14 }
272+
- { os: windows-2022, config: windows-2022-msvc-1940 }
273+
- { os: android-35, config: android-35-x86_64 }
272274
steps:
273275
- name: checkout
274276
uses: actions/checkout@v4
@@ -294,7 +296,7 @@ jobs:
294296
- name: conan remote
295297
run: conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan
296298
- name: conan config
297-
run: conan config install .github/config/${{ matrix.os }}-${{ matrix.compiler }}/conan
299+
run: conan config install .github/config/${{ matrix.config }}/conan
298300

299301
- name: conan odrcore
300302
run: conan export . --name odrcore --version 0.0.0

0 commit comments

Comments
 (0)