Skip to content

Commit

Permalink
Revert "[ci] update properties for macOS builders"
Browse files Browse the repository at this point in the history
This reverts commit fdd903c.
  • Loading branch information
alex-w committed Nov 26, 2023
1 parent fdd903c commit 79be2fa
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 2 deletions.
10 changes: 9 additions & 1 deletion .github/workflows/ci-beta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,15 @@ jobs:
# @BODY At the moment after installing gpsd (brew install gpsd) library can be found by cmake, but not headers! Apparently we should add some magic for environment variables or something else on macOS Catalina to make headers available for cmake/make
steps:
- name: Install dependencies
run: brew install qt@6 nlopt exiv2 inih
run: |
brew install inih # XXX: this should be put into dependencies in exiv2 formula
cd /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/Formula/e/
sed -e 's@0\.27\[email protected]@g' -e 's@4c192483a1125dc59a3d70b30d30d32edace9e14adf52802d2f853abf72db8a6@89af3b5ef7277753ef7a7b5374ae017c6b9e304db3b688f1948e73e103491f3d@g' exiv2.rb > exiv2.rb-
mv exiv2.rb- exiv2.rb
cd -
export HOMEBREW_NO_INSTALL_FROM_API=1
brew install --build-from-source exiv2
brew install qt@6 nlopt
- name: Checkout repository
uses: actions/checkout@v3
Expand Down
11 changes: 10 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,16 @@ jobs:
# @BODY At the moment after installing gpsd (brew install gpsd) library can be found by cmake, but not headers! Apparently we should add some magic for environment variables or something else on macOS Catalina to make headers available for cmake/make
steps:
- name: Install dependencies
run: brew install qt@5 nlopt exiv2 inih
run: |
cat /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/Formula/e/exiv2.rb # temporary, for debugging
brew install inih # XXX: this should be put into dependencies in exiv2 formula
cd /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/Formula/e/
sed -e 's@0\.27\[email protected]@g' -e 's@4c192483a1125dc59a3d70b30d30d32edace9e14adf52802d2f853abf72db8a6@89af3b5ef7277753ef7a7b5374ae017c6b9e304db3b688f1948e73e103491f3d@g' exiv2.rb > exiv2.rb-
mv exiv2.rb- exiv2.rb
cd -
export HOMEBREW_NO_INSTALL_FROM_API=1
brew install --build-from-source exiv2
brew install qt@5 nlopt
- name: Checkout repository
uses: actions/checkout@v3
Expand Down

0 comments on commit 79be2fa

Please sign in to comment.