Skip to content

Commit

Permalink
Merge branch 'development' into feature/windows
Browse files Browse the repository at this point in the history
  • Loading branch information
gisogrimm committed Jun 3, 2024
2 parents c9f9e30 + 3833543 commit 01287bf
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 2 deletions.
27 changes: 27 additions & 0 deletions .github/workflows/macos-13.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: MacOS make 13

on:
push:
branches: [ master, development ]

jobs:
build:

runs-on: macos-13

steps:
- uses: actions/checkout@v4
- name: Fetch git tags
run: git fetch --unshallow --tags
- name: Install submodules
run: git submodule update --init --recursive
- name: Install dependencies
run: brew install pkgconfig glibmm jack liblo libsndfile gtkmm3 eigen boost gsl fftw libsamplerate cpprestsdk nlohmann-json openssl coreutils libsoundio xerces-c jpeg libmatio libltc
- name: make
run: make lib libtest && make
- name: packaging
run: make packaging
- uses: actions/upload-artifact@v4
with:
name: ovbox-macOS-13
path: packaging/Darwin/*.tgz
File renamed without changes.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
all: build lib binaries

BINARIES = ov-client ov-client_hostname ov-client_listsounddevs ovbox \
test_exec ovrealpath ovbox_cli ovbox_version
ovrealpath ovbox_cli ovbox_version

EXTERNALS = jack liblo sndfile libcurl gsl samplerate fftw3f xerces-c

Expand Down
4 changes: 3 additions & 1 deletion tools/pi/autorun
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,9 @@ while true; do
if test "$OSREL" = "buster"; then
OSRELHTCH=bionic
fi
(echo "";echo "deb [arch=armhf] http://aptdev.hoertech.de ${OSRELHTCH} universe")|sudo tee -a /etc/apt/sources.list
# identify OS architecture:
OSARCH=`dpkg-architecture | grep -e 'DEB_BUILD_ARCH='|sed 's/[^=]*=//1'`
(echo "";echo "deb [arch=${OSARCH]´}] http://aptdev.hoertech.de ${OSRELHTCH} universe")|sudo tee -a /etc/apt/sources.list
sudo apt update --assume-yes
sudo apt install --no-install-recommends --assume-yes ov-client
fi
Expand Down

0 comments on commit 01287bf

Please sign in to comment.