Skip to content

Commit

Permalink
Another attempt to fix GitHub Actions
Browse files Browse the repository at this point in the history
  • Loading branch information
kovzol committed Feb 10, 2025
1 parent 96bda68 commit a828ac8
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
mkdir build
cd build
emcmake cmake -DSWORD_BUILD_UTILS=No -DSWORD_BUILD_EXAMPLES=No -DLIBSWORD_LIBRARY_TYPE=Static ..
emmake make sword
emmake make sword_static
emmake make install
- name: make-wasm
run: |
Expand Down Expand Up @@ -169,8 +169,8 @@ jobs:
- name: prerequisites-pbrst
run: |
brew install bison m4
echo 'export PATH="/opt/homebrew/opt/bison/bin:$PATH"' >> /Users/runner/.bash_profile
echo 'export PATH="/opt/homebrew/opt/m4/bin:$PATH"' >> /Users/runner/.bash_profile
echo 'export PATH="$(brew --prefix bison)/bin:$PATH"' >> /Users/runner/.bash_profile
echo 'export PATH="$(brew --prefix m4)/bin:$PATH"' >> /Users/runner/.bash_profile
- name: prerequisites-qt
run: |
brew install qt graphviz
Expand Down
4 changes: 0 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,7 @@ include_directories(${sword_INCLUDE_DIRS})

set(PARSER_DIR "${CMAKE_CURRENT_BINARY_DIR}")
find_package(FLEX 2.6 REQUIRED)
if(APPLE) # sometimes macOS does not find the new bison package, installed via homebrew...
find_package(BISON 2.3 REQUIRED)
else()
find_package(BISON 3.0 REQUIRED)
endif(APPLE)

set(LEXER_OUT "${PARSER_DIR}/pbrst.c")
set(PARSER_OUT "${PARSER_DIR}/pbrst.tab.c")
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
# 2. Build libsword.a by using https://github.com/kovzol/crosswire-sword-mirror
# and the cmake toolchain from Emscripten (via
# "emcmake cmake -DSWORD_BUILD_UTILS=No -DSWORD_BUILD_EXAMPLES=No -DLIBSWORD_LIBRARY_TYPE=Static ..").
# You may need to have a recent cmake. Then run "make sword" to
# You may need to have a recent cmake. Then run "make sword_static" to
# build libsword.a and type "make install" to copy the library automatically
# to the folders .../emsdk/cache/sysroot/{lib,share,include}. The settings
# in the cmake configuration are important, otherwise the SWORD utilities
# and examples will also be built, but some of them will eventually fail
# and the library will not be copied to the official emsdk folder.
# (In that case you need to do that manually.) There cannot be no shared library created
# on this platform, only static.
# (In that case you need to do that manually.) There can be no shared library created
# on this platform, only static, but that's okay.
#
# 3. Step 2 will make sure that libsword.a is visible for the rest of the process.
# Unfortunately, since static libraries are not available published properly by
Expand Down

0 comments on commit a828ac8

Please sign in to comment.