Skip to content

Commit 28ed01f

Browse files
committed
Updates
1 parent 60c3c00 commit 28ed01f

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

.github/workflows/build-wheels.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
matrix:
1414
# os: [ubuntu-latest, windows-latest, macOS-latest, ubuntu-20.04, ]
15-
os: [ubuntu-22.04] #, windows-latest, macos-12, macOS-latest]
15+
os: [ubuntu-22.04, windows-latest, macos-12, macOS-latest]
1616
python-version: ['3.11']
1717

1818
steps:
@@ -32,6 +32,7 @@ jobs:
3232
run: |
3333
sudo apt install musl-tools
3434
35+
# Compiling the WbRunner app on linux causes an error related to openssl, so use exclude_runner
3536
- name: Run build script linux
3637
if: startsWith(matrix.os, 'ubuntu')
3738
run: python build.py do_clean exclude_runner zip

build.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@
99
# Script Keyword Arguments:
1010
#
1111
# do_clean If present, the existing files will be cleaned before compiling.
12-
# exclude_runner Excludes the WhiteboxTools Runner app from the build (Windows and macos).
12+
# exclude_runner Excludes the WhiteboxTools Runner app from the build.
1313
# zip Creates a zip file output in addition to the WBT folder
1414
#
1515
# Notes:
1616
# You will need Rust installed before running the script. The output will be contained within a
17-
# folder named 'WBT'. The WhiteboxTools Runner app will always be excluded from Linux builds.
18-
# Compiling the Runner causes an error on our Ubuntu compile target.
17+
# folder named 'WBT'. The WhiteboxTools Runner app often results in an error when compiling on
18+
# Linux. This seems to be related to openssl libraries, which need to be set up correctly. If
19+
# you are unable to figure out the set-up correctly and you do not need the Runner app, you
20+
# would be advised to use the exclude_runner argument on linux.
1921
#
2022
# Example:
2123
# python3 build.py do_clean exclude_runner zip
@@ -44,7 +46,7 @@ def build(do_clean=False, exclude_runner=False, create_zip_artifact=False):
4446

4547
# Create the Cargo.toml file
4648
workspace_str = '[workspace]\nmembers = ["whitebox-common", "whitebox-lidar", "whitebox-plugins", "whitebox-raster", "whitebox-runner", "whitebox-tools-app", "whitebox-vector"]\n\n'
47-
if exclude_runner: # or platform.system() == 'Linux':
49+
if exclude_runner:
4850
# Exclude the runner if the second command line arg is set to True or if the platform is linux
4951
workspace_str = '[workspace]\nmembers = ["whitebox-common", "whitebox-lidar", "whitebox-plugins", "whitebox-raster", "whitebox-tools-app", "whitebox-vector"]\n\n'
5052

0 commit comments

Comments
 (0)