Skip to content

Commit

Permalink
CI: github actions ensure compiler support
Browse files Browse the repository at this point in the history
  • Loading branch information
henryborchers committed Aug 16, 2023
1 parent 3512a36 commit 3b1d8d7
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions .github/workflows/tox_matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
python-version: ['3.8' ,'3.9', '3.10', '3.11']
include:
- os: macos-latest
compiler_version: 14.0
compiler_version: 14
compiler_libcxx: libc++
- os: ubuntu-latest
compiler_version: 11.4
Expand Down Expand Up @@ -49,7 +49,7 @@ jobs:
id: cache
with:
path: "${{ matrix.conan_user_home }}/.conan"
key: ${{ runner.os }}-${{ hashFiles('**/conanfile.py') }}
key: ${{ runner.os }}-compiler-${{ matrix.compiler_version}} ${{ hashFiles('**/conanfile.py') }}
- name: Ensure conan settings has current compiler as valid
if: "!contains(matrix.os, 'windows')"
env:
Expand Down Expand Up @@ -78,9 +78,6 @@ jobs:
run: |
conan config set general.revisions_enabled=1
conan install . --build missing --build=openjpeg -pr:b=default
$(conan info $(pwd)/conanfile.py --paths --package-filter="tesseract/*" | grep package_folder: | sed -e 's/[ \t]*package_folder: //' -e "s/$/\/bin\/tesseract/") --version > $(pwd)/results.txt && \
cat $(pwd)/results.txt && \
if grep -q libopenjp2 $(pwd)/results.txt; then echo "libopenjp2 check successful"; else >&2 echo "Tesseract was not built with openjpeg " ; exit 1; fi
- name: Run tox on Windows
if: contains(matrix.os, 'windows')
shell: cmd
Expand Down

0 comments on commit 3b1d8d7

Please sign in to comment.