Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ jobs:
- run:
name: Installing apt Packages
command: |
curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /etc/apt/trusted.gpg.d/yarn.gpg
echo "deb [signed-by=/etc/apt/trusted.gpg.d/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
apt-get update
apt-get install -y --no-install-recommends \
automake \
Expand Down
46 changes: 30 additions & 16 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,42 @@ jobs:
strategy:
matrix:
include:
- os: ubuntu-24.04
compiler-pkg: g++-14
env:
CC: gcc-14
CXX: g++-14
- os: ubuntu-22.04
compiler-pkg: g++-12
env:
CC: gcc-12
CXX: g++-12
- os: ubuntu-20.04
compiler-pkg: g++-9
- os: ubuntu-22.04
compiler-pkg: g++-10
env:
CC: gcc-10
CXX: g++-10
- os: ubuntu-24.04
compiler-pkg: clang-18
env:
CC: gcc-9
CXX: g++-9
CC: clang-18
CXX: clang++-18
- os: ubuntu-22.04
compiler-pkg: clang-14
compiler-pkg: clang-15
env:
CC: clang-14
CXX: clang++-14
- os: ubuntu-20.04
compiler-pkg: clang-9
CC: clang-15
CXX: clang++-15
- os: ubuntu-22.04
compiler-pkg: clang-13
env:
CC: clang-9
CXX: clang++-9
CXXFLAGS: -fno-builtin
CC: clang-13
CXX: clang++-13
- os: macos-15 # arm64
xcode: Xcode_26.0
- os: macos-15 # arm64
xcode: Xcode_16.0
xcode: Xcode_16.4
- os: macos-14 # arm64
xcode: Xcode_16.0
xcode: Xcode_16.2
- os: macos-13 # Intel
xcode: Xcode_15.2
- os: macos-13 # Intel
Expand Down Expand Up @@ -63,7 +74,6 @@ jobs:
libqt5opengl5-dev
libsndfile1-dev
libtool
libwebsocketpp-dev
libxml2-dev
pkg-config
)
Expand Down Expand Up @@ -95,7 +105,6 @@ jobs:
pkg-config
qt@5
vrpn
websocketpp
)
brew install ${PACKAGES[@]}
echo CPPFLAGS="-I$(brew --prefix)/include" >> $GITHUB_ENV
Expand All @@ -119,6 +128,11 @@ jobs:
if: startsWith(matrix.os, 'ubuntu')
run: |
ci/build-deps-ubuntu.sh
- name: Build websocketpp
# This is needed until https://github.com/zaphoyd/websocketpp/pull/1164
# is merged and available as apt and brew packages.
run: |
ci/build-websocketpp.sh
- name: upload VRPN logs
if: failure() && startsWith(matrix.os, 'ubuntu')
uses: actions/upload-artifact@v4
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/pd-externals.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,16 +133,22 @@ jobs:
path: ssr/flext/build/*

deken-package:
# Deken is not available on 22.04,
# see https://github.com/pure-data/deken/issues/260
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
container: registry.git.iem.at/pd/deken
needs: [linux, macos, windows]
steps:
- name: Install Git
run: |
apt-get update
apt-get install --assume-yes --no-install-recommends git
- name: Clone Git repository
uses: actions/checkout@v4
with:
# check out all tags to get proper version in Deken package
fetch-depth: 0
- name: git clone fix
# https://github.com/actions/checkout/issues/1169:
run: git config --system --add safe.directory $GITHUB_WORKSPACE
- name: Retrieve Linux externals
uses: actions/download-artifact@v4
with:
Expand All @@ -158,12 +164,6 @@ jobs:
with:
name: windows-externals
path: ssr
- name: Install deken
run: |
sudo apt-get install --no-install-recommends deken
# work-arounds from https://github.com/pure-data/deken/issues/247:
mkdir ~/.deken
python3 -m pip install hy==0.19
- name: Run deken
run: |
deken package -v $(git describe --tags --always) --objects flext/objects.txt ssr
Expand Down
6 changes: 5 additions & 1 deletion ci/build-small-libsndfile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@ set -euo pipefail

git clone https://github.com/libsndfile/libsndfile.git
cd libsndfile
git checkout 1.1.0
git checkout 1.2.2
# https://github.com/libsndfile/libsndfile/issues/1049
git config user.name "Dummy Name for cherry-pick"
git config --global user.email "cherry-pick@example.com"
git cherry-pick 2251737b3b175925684ec0d37029ff4cb521d302
autoreconf -vif
./configure \
--disable-sqlite \
Expand Down
16 changes: 16 additions & 0 deletions ci/build-websocketpp.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/usr/bin/env bash

set -euo pipefail

git clone https://github.com/zaphoyd/websocketpp.git
cd websocketpp
# https://github.com/zaphoyd/websocketpp/pull/1164
git fetch origin pull/1164/head
git checkout FETCH_HEAD
mkdir build
cd build
cmake ..
make
sudo make install
cd ..
cd ..
2 changes: 2 additions & 0 deletions doc/manual/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
r'http://localhost:\d+',
# This works in the browser, but not with linkcheck:
'https://github.com/AudioSceneDescriptionFormat/asdf-rust#building-the-c-api',
# "Read timed out":
'https://aur.archlinux.org',
]

# -- Options for HTML output ---------------------------------------------------
Expand Down
Loading