Skip to content

Commit cb8b145

Browse files
committed
GA: macos: install curl and icu4c only if there are not installed
1 parent 9aa699c commit cb8b145

File tree

3 files changed

+25
-4
lines changed

3 files changed

+25
-4
lines changed

.github/workflows/autotools-macos.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,13 @@ jobs:
3030
- name: Install dependencies
3131
run: |
3232
brew install autoconf automake cabextract libtool
33-
brew install curl icu4c leptonica libarchive pango
33+
brew install leptonica libarchive pango
34+
if ! brew list icu4c &>/dev/null; then
35+
brew install icu4c
36+
fi
37+
if ! brew list curl &>/dev/null; then
38+
brew install curl
39+
fi
3440
3541
- name: Setup Tesseract
3642
run: |

.github/workflows/cmake.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
matrix:
2424
config:
2525
- { name: macos-14-clang-15-cmake, os: macos-14, cxx: clang++ } # default
26-
- { name: macos-14-gcc-14-cmake, os: macos-14, cxx: g++-14 } #installed
26+
- { name: macos-15-gcc-14-cmake, os: macos-15, cxx: g++ } #installed
2727
- { name: macos-15-clang-cmake, os: macos-15, cxx: clang++ } # default
2828

2929
- { name: ubuntu-22.04-clang-15-cmake, os: ubuntu-22.04, cxx: clang++-15 } #installed
@@ -51,8 +51,16 @@ jobs:
5151
run: |
5252
brew install autoconf automake
5353
brew install leptonica
54-
# brew install libarchive
54+
# if ! brew list libarchive &>/dev/null; then
55+
# brew install libarchive
56+
# fi
5557
brew install pango
58+
if ! brew list icu4c &>/dev/null; then
59+
brew install icu4c
60+
fi
61+
if ! brew list curl &>/dev/null; then
62+
brew install curl
63+
fi
5664
brew install cabextract
5765
ninja --version
5866
cmake --version

.github/workflows/unittest-macos.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,14 @@ jobs:
2525
- name: Install dependencies (macOS Homebrew)
2626
run: |
2727
brew install autoconf automake cabextract libtool
28-
brew install curl icu4c leptonica libarchive pango
28+
brew install leptonica libarchive pango
29+
if ! brew list icu4c &>/dev/null; then
30+
brew install icu4c
31+
fi
32+
if ! brew list curl &>/dev/null; then
33+
brew install curl
34+
fi
35+
2936
- name: Setup
3037
run: |
3138
./autogen.sh

0 commit comments

Comments
 (0)