Skip to content

Commit

Permalink
build: Use jinja2-cli Homebrew formula instead of the just removed py…
Browse files Browse the repository at this point in the history
…thon-jinja

See Homebrew/homebrew-core#165495 for the removal.
  • Loading branch information
rbalint committed Mar 8, 2024
1 parent 0c076a4 commit 4553da5
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ jobs:
export XML_CATALOG_FILES=/usr/local/etc/xml/catalog
fi
export PATH=${HOMEBREW_PREFIX}/opt/ccache/libexec:$PATH
export PYTHONPATH=$(ls -d ${HOMEBREW_PREFIX}/lib/python*/site-packages | tail -n1)
export PYTHONPATH=$(ls -d ${HOMEBREW_PREFIX}/Cellar/jinja2-cli/*/libexec/lib/*/site-packages | tail -n1)
cmake -DCMAKE_BUILD_TYPE=Debug -B build-make
make -C build-make -j$(getconf _NPROCESSORS_ONLN)
- name: test
Expand All @@ -361,7 +361,7 @@ jobs:
export XML_CATALOG_FILES=/usr/local/etc/xml/catalog
fi
export PATH=${HOMEBREW_PREFIX}/opt/ccache/libexec:$PATH
export PYTHONPATH=$(ls -d ${HOMEBREW_PREFIX}/lib/python*/site-packages | tail -n1)
export PYTHONPATH=$(ls -d ${HOMEBREW_PREFIX}/Cellar/jinja2-cli/*/libexec/lib/*/site-packages | tail -n1)
cmake -G Xcode -B build-xcode
cd build-xcode
xcodebuild
Expand Down
2 changes: 1 addition & 1 deletion Brewfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ brew "docbook-xsl"
brew "graphviz"
brew "hopscotch-map"
brew "jemalloc"
brew "python-jinja"
brew "jinja2-cli"
brew "libconfig"
brew "libplist"
brew "xxhash"
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ Build:

export XML_CATALOG_FILES=/usr/local/etc/xml/catalog
cmake .
export PYTHONPATH=$(ls -d ${HOMEBREW_PREFIX}/Cellar/jinja2-cli/*/libexec/lib/*/site-packages | tail -n1)
make check

Install:
Expand Down
2 changes: 1 addition & 1 deletion bitrise.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ workflows:
# debug log
set -x
NPROC="$(getconf _NPROCESSORS_ONLN)"
export PYTHONPATH=$(ls -d /opt/homebrew/lib/python*/site-packages | tail -n1)
export PYTHONPATH=$(ls -d /opt/homebrew/Cellar/jinja2-cli/*/libexec/lib/*/site-packages | tail -n1)
sudo defaults write /Library/Preferences/com.apple.security.libraryvalidation.plist DisableLibraryValidation -bool true
cmake -DCMAKE_BUILD_TYPE=Release -B build-make
make -C build-make -j$NPROC
Expand Down

0 comments on commit 4553da5

Please sign in to comment.