Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
c04e12d
Try and compile on Mac via GitHub Actions
peternewman Dec 7, 2022
34d8a22
Fix the Workflow syntax
peternewman Dec 7, 2022
eb18c14
Remove accidental copy and paste
peternewman Dec 7, 2022
699306a
Comment out the fold temporarily
peternewman Dec 7, 2022
df2915a
Add more missing packages
peternewman Dec 7, 2022
e0780c7
Disable the Python stuff temporarily...
peternewman Dec 7, 2022
dd72415
Try harder to temporarily disable the Python stuff
peternewman Dec 7, 2022
5a591e7
Use ccache and cache the build
peternewman Dec 8, 2022
2facf1a
Add a basic test script to call olad --help
peternewman Dec 8, 2022
00c931c
Fix the Makefile source line
peternewman Dec 8, 2022
8e346af
Temporarily deliberately fail so we can view the output
peternewman Dec 9, 2022
78f4a68
Correctly break the build to see the output...
peternewman Dec 9, 2022
a2ef585
Test codemagic
peternewman Dec 9, 2022
c0bad67
Try compiling on clang as well as g++
peternewman Dec 10, 2022
4af8875
Don't fail fast
peternewman Dec 10, 2022
098ac4e
Merge branch '0.10' into peternewman-0.10-mac
peternewman Jun 21, 2023
9be813a
Debug protoc version check on Mac
peternewman Jun 22, 2023
29bb082
Switch to an older version of protobuf before we fix our versioning
peternewman Jun 22, 2023
d7863ce
Try a middle ground protobuf
peternewman Jun 22, 2023
6908b9d
Make sure we can load and find our special protobuf version
peternewman Jul 5, 2023
85c89f4
Ensure the protoc executable is available too
peternewman Jul 5, 2023
28c3b50
Merge branch '0.10' into peternewman-0.10-mac
peternewman Jun 28, 2025
ce67921
Update to current Mac OS runner version
peternewman Jun 28, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 45 additions & 0 deletions .github/workflows/compilation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# GitHub Action to compile and test
name: compilation
on: [push, pull_request]
jobs:
compile:
runs-on: macos-13
strategy:
fail-fast: false
matrix:
cxx: [g++, clang++]
steps:
- uses: actions/checkout@master
- name: Install dependencies
run: |
brew update
brew install ccache
# This is all the bits we need to enable all options on Mac
brew install automake
brew install bison
brew install flex
# Installing via the addon isn't currently working so do it the old fashioned way below
# - https://raw.githubusercontent.com/Homebrew/homebrew-core/024ca9a4730a1f26ceede43485fbf62ef6f41179%5E/Formula/protobuf@3.1.rb
brew install liblo
brew install libmicrohttpd
brew install ossp-uuid
# Looks like this is Python 3 only, so install via pip
# brew install numpy
brew install libusb
brew install pkg-config
# TODO(Peter): Upgrade this after #1867
brew install protobuf@3
brew install cppunit
- name: ccache
uses: hendrikmuhs/ccache-action@v1.2
- name: Compile
env:
TASK: 'compile'
CXX: ${{ matrix.cxx }}
run: |
PATH=/usr/local/opt/ccache/libexec:$PATH # Use ccache on Mac too
export PATH="/usr/local/opt/protobuf@3/bin:$PATH"
export LDFLAGS="-L/usr/local/opt/protobuf@3/lib"
export CPPFLAGS="-I/usr/local/opt/protobuf@3/include"
export PKG_CONFIG_PATH="/usr/local/opt/protobuf@3/lib/pkgconfig"
bash -ex .travis-ci.sh
24 changes: 13 additions & 11 deletions .travis-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -237,24 +237,26 @@ else
# Silence all deprecated declarations on Linux due to auto_ptr making the build log too long
export DISTCHECK_CONFIGURE_FLAGS='--enable-rdm-tests --enable-ja-rule --enable-e133 CPPFLAGS=-Wno-deprecated-declarations'
else
export DISTCHECK_CONFIGURE_FLAGS='--enable-rdm-tests --enable-ja-rule --enable-e133'
#export DISTCHECK_CONFIGURE_FLAGS='--enable-rdm-tests --enable-ja-rule --enable-e133'
# Disable the Python stuff temporarily...
export DISTCHECK_CONFIGURE_FLAGS='--disable-python-libs --disable-rdm-tests --enable-ja-rule --enable-e133'
fi
travis_fold start "autoreconf"
#travis_fold start "autoreconf"
autoreconf -i;
travis_fold end "autoreconf"
travis_fold start "configure"
#travis_fold end "autoreconf"
#travis_fold start "configure"
./configure $DISTCHECK_CONFIGURE_FLAGS;
travis_fold end "configure"
travis_fold start "make_distcheck"
#travis_fold end "configure"
#travis_fold start "make_distcheck"
make distcheck VERBOSE=1;
travis_fold end "make_distcheck"
travis_fold start "make_dist"
#travis_fold end "make_distcheck"
#travis_fold start "make_dist"
make dist;
travis_fold end "make_dist"
travis_fold start "verify_trees"
#travis_fold end "make_dist"
#travis_fold start "verify_trees"
tarball=$(ls -Ut ola*.tar.gz | head -1)
tar -zxf $tarball;
tarball_root=$(echo $tarball | sed 's/.tar.gz$//')
./scripts/verify_trees.py ./ $tarball_root
travis_fold end "verify_trees"
#travis_fold end "verify_trees"
fi
5 changes: 5 additions & 0 deletions codemagic.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
workflows:
hello-world:
name: Hello world workflow
scripts:
- echo "Hello World!"
3 changes: 2 additions & 1 deletion config/ola.m4
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ else
AC_PATH_PROG([PROTOC],[protoc])
fi


set -x
if test -z "$PROTOC" ; then
AC_MSG_ERROR([cannot find 'protoc' program]);
elif test -n "$1" ; then
Expand Down Expand Up @@ -74,6 +74,7 @@ elif test -n "$1" ; then
AC_MSG_ERROR([protoc version too old $protoc_version < $required]);
fi
fi
set +x

AC_ARG_WITH([ola-protoc-plugin],
[AS_HELP_STRING([--with-ola-protoc-plugin=COMMAND],
Expand Down
10 changes: 9 additions & 1 deletion olad/Makefile.mk
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,12 @@ olad_OlaTester_SOURCES = \
olad_OlaTester_CXXFLAGS = $(COMMON_TESTING_PROTOBUF_FLAGS)
olad_OlaTester_LDADD = $(COMMON_OLAD_TEST_LDADD)

CLEANFILES += olad/ola-output.conf
test_scripts += olad/OladHelpTest.sh

olad/OladHelpTest.sh: olad/Makefile.mk
echo "${top_builddir}/olad/olad${EXEEXT} --help; STATUS=\$$?; if [ \$$STATUS -ne 0 ]; then echo \"FAIL: olad exited with status \$$STATUS\"; exit \$$STATUS; fi; exit 1" > $(top_builddir)/olad/OladHelpTest.sh
chmod +x $(top_builddir)/olad/OladHelpTest.sh

CLEANFILES += \
olad/OladHelpTest.sh \
olad/ola-output.conf
Loading