Skip to content

Commit 869e075

Browse files
author
Antoine Champion
committed
ci: fix runner builds after dependencies upgrades
1 parent ea93d1b commit 869e075

6 files changed

+12
-26
lines changed

.github/workflows/build_plugin_windows.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
- name: CMake
4747
shell: powershell
4848
run: |
49-
cmake . -G "Visual Studio 17 2022" -DVCPKG_TARGET_TRIPLET=x64-windows-static -DCMAKE_TOOLCHAIN_FILE=D:/a/formula/formula/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_WIN_DIR=D:/a/formula/formula/vcpkg/installed/x64-windows-static -DFORMULA_STANDALONE=1 -DCMAKE_BUILD_TYPE=Release
49+
cmake . -G "Visual Studio 17 2022" -DVCPKG_TARGET_TRIPLET=x64-windows-static -DCMAKE_TOOLCHAIN_FILE=D:/a/formula/formula/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_WIN_DIR=D:/a/formula/formula/vcpkg/installed/x64-windows-static -DBOOST_ROOT="C:\local\boost_1_84_0" -DFORMULA_STANDALONE=1 -DCMAKE_BUILD_TYPE=Release
5050
5151
- name: CMake Build
5252
shell: powershell

CMakeLists.txt

-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
1010
# Set preprocessor directives for Formula
1111

1212
add_compile_definitions(FORMULA_VERSION="${CMAKE_PROJECT_VERSION}")
13-
if(FORMULA_LOCAL_ONLY)
14-
add_compile_definitions(FORMULA_LOCAL_ONLY)
15-
endif()
1613
set(FORMULA_COMPILE_FORMATS "AU" "VST3")
1714
if(FORMULA_STANDALONE)
1815
list (APPEND FORMULA_COMPILE_FORMATS "Standalone")

configure-linux.sh

+9-17
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
JuceVersion="7.0.5"
44
LLVMVersion="11"
5-
BoostVersion="1.84"
5+
BoostVersion="1.84.0"
6+
7+
set -e
68

79
if [ "$EUID" -ne 0 ]
810
then echo "Please run as root"
@@ -22,24 +24,14 @@ echo "Installing LLVM"
2224
apt-get install llvm-$LLVMVersion clang-$LLVMVersion -y
2325

2426
echo "Installing Boost"
25-
apt-get install libboost$BoostVersion-dev -y
26-
BOOST_PACKAGES=(
27-
"boost-date-time"
28-
"boost-filesystem"
29-
)
30-
for PACKAGE in "${BOOST_PACKAGES[@]}"
31-
do
32-
apt-get install lib$PACKAGE$BoostVersion-dev -y
33-
done
34-
35-
: '
3627
BoostVersion_=$(echo boost_$BoostVersion | tr '.' '_')
37-
https://boostorg.jfrog.io/artifactory/main/release/$BoostVersion/source/boost_$(echo $BoostVersion | tr '.' '_').tar.gz
38-
tar xzfv $BoostVersion_.tar.gz
39-
cd $BoostVersion_
28+
wget "https://boostorg.jfrog.io/artifactory/main/release/$BoostVersion/source/boost_$(echo $BoostVersion | tr '.' '_').tar.gz"
29+
tar xzfv "$BoostVersion_.tar.gz"
30+
cd "$BoostVersion_"
4031
./bootstrap.sh --prefix=/usr/local/
41-
./b2 && ./b2 install
42-
'
32+
./b2 link=static runtime-link=static --with-date_time --with-filesystem --with-iostreams
33+
./b2 install
34+
cd ..
4335

4436
echo "Installing JUCE"
4537
if [[ ! -d "JUCE" ]]; then

configure-mac.sh

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
JuceVersion="7.0.5"
44
LLVMVersion="11"
5-
OpenSSLVersion="1.1"
65
VCPKGVersion="2024.03.19" # Boost 1.84, cpprestsdk 2.10.19
76

87
echo "Installing CMake"

configure-windows.ps1

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
$JuceVersion="7.0.5"
44
$LLVMVersion="11.1.0"
55
$OpenSSLVersion="1.1.1.1300"
6-
$BoostVersion="1.84"
6+
$BoostVersion="1.84.0.1"
77
$CMakeVersion="3.22.1"
88

99
if (Get-Command -Name choco -ErrorAction SilentlyContinue) {
@@ -24,7 +24,7 @@ Write-Host "Installing OpenSSL $OpenSSLVersion"
2424
choco install openssl --version $OpenSSLVersion -y
2525
Write-Host
2626
Write-Host "Installing Boost $BoostVersion"
27-
choco install boost-msvc-14.2 --version $BoostVersion -y
27+
choco install boost-msvc-14.3 --version $BoostVersion -y
2828
Write-Host
2929
Write-Host "Installing LLVM $LLVMVersion"
3030
choco install llvm --version $LLVMVersion -y

src/gui/PluginWindow.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ formula::gui::PluginWindow::PluginWindow(
3939

4040
tabs.addTab("Editor", colour, new CodeEditorTab(eventHub, pluginState, userIndexRef), true);
4141
tabs.addTab("Saved files", colour, new SavedFormulasTab(eventHub, pluginState, userIndexRef), true);
42-
#ifndef FORMULA_LOCAL_ONLY
4342
tabs.addTab("All Formulas", colour, new CommunityFormulasTab(eventHub, communityIndexRef), true);
44-
#endif
4543
tabs.addTab("Settings", colour, new SettingsTab(eventHub, filePlayerRef), true);
4644

4745
addAndMakeVisible(tabs);

0 commit comments

Comments
 (0)