Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Trying to fix all of the builds #352

Closed
wants to merge 25 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
b068286
try adding boost-spirit to install-deps.bat
NQNStudios May 27, 2024
6590d73
try including boost/filesystem.hpp
NQNStudios May 27, 2024
a313545
try including boost/filesystem.hpp in scen.fileio.cpp
NQNStudios May 27, 2024
ce99e9b
try including boost/filesystem.hpp in scen.core.cpp
NQNStudios May 27, 2024
a717b53
try including boost/filesystem.hpp in scen.keydlgs.cpp
NQNStudios May 27, 2024
a2e3c28
use new copy_options enum
NQNStudios May 27, 2024
de018c2
try updating CI ubuntu to latest
NQNStudios May 28, 2024
682eb27
linux build tgui without c++17 features
NQNStudios May 28, 2024
3aa4a9f
try macos-12 runner
NQNStudios May 28, 2024
afa5486
try TGUI_CXX_STANDARD instead
NQNStudios May 28, 2024
28ddacf
try macos-12 for mac scons
NQNStudios May 28, 2024
ca6407e
debug print the path to xcode
NQNStudios May 28, 2024
2a79b69
point mac build to new xcode developer directory
NQNStudios May 28, 2024
7f7b113
try include vector to fix mac scons error
NQNStudios May 28, 2024
1823fea
try pinning visual studio boost version to 1.76
NQNStudios May 28, 2024
46b51fb
add builtin-baseline
NQNStudios May 28, 2024
dccac12
builtin-baseline and 1.76.0 for both vs builds
NQNStudios May 28, 2024
9a88eae
vcpkg set its own baseline
NQNStudios May 28, 2024
748cee3
mac pin boost @1.76
NQNStudios May 28, 2024
6e85231
windows builds try different vcpkg baseline
NQNStudios May 28, 2024
48fa461
mac scons pin [email protected]
NQNStudios May 28, 2024
ac4809d
Revert attempts at pinning dependencies
NQNStudios May 28, 2024
29b6318
try making a new xcode project by copying
NQNStudios May 28, 2024
227c1d9
Actually add the new xcode project
NQNStudios May 28, 2024
bb1f294
xcode debug build
NQNStudios May 28, 2024
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
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@

jobs: {
macos-xcode: {
runs-on: macos-10.15,
runs-on: macos-12,
env: {
DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
},
steps: [
{
Expand All @@ -32,20 +32,20 @@
},
{
name: patch Xcode project,
run: ./.github/workflows/scripts/mac/fix-xcode-proj.sh
run: ./.github/workflows/scripts/mac/fix-xcode-proj.sh 14
},
{
name: build,
run: ./.github/workflows/scripts/mac/xcode-build.sh
run: ./.github/workflows/scripts/mac/xcode-build.sh 14
},
{
name: unit tests,
run: ./.github/workflows/scripts/mac/run-tests.sh
run: ./.github/workflows/scripts/mac/run-tests.sh 14
}
]
},
macos-scons: {
runs-on: macos-10.15,
runs-on: macos-12,
steps: [
{
name: checkout,
Expand Down Expand Up @@ -147,7 +147,7 @@
# ]
# },
linux: {
runs-on: ubuntu-20.04,
runs-on: ubuntu-22.04,
steps: [
{
name: checkout,
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scripts/linux/install-tgui.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
git clone --depth 1 -b 0.9 https://github.com/texus/TGUI.git
cd TGUI
export CLICOLOR_FORCE=1
cmake .
cmake -D TGUI_CXX_STANDARD=14 .
make
cmake --install .
cd .. # Probably not needed but...
2 changes: 1 addition & 1 deletion .github/workflows/scripts/mac/fix-xcode-proj.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/sh -v

sed -E -i '' -e 's| "?/Library/Frameworks/([a-zA-Z-]+)\.framework"?| "/usr/local/Frameworks/\1.framework"|' -e 's|/opt/local/libexec/boost/[0-9.]+/lib/|/usr/local/lib/|' proj/xc12/BoE.xcodeproj/project.pbxproj
sed -E -i '' -e 's| "?/Library/Frameworks/([a-zA-Z-]+)\.framework"?| "/usr/local/Frameworks/\1.framework"|' -e 's|/opt/local/libexec/boost/[0-9.]+/lib/|/usr/local/lib/|' proj/xc$1/BoE.xcodeproj/project.pbxproj
2 changes: 1 addition & 1 deletion .github/workflows/scripts/mac/run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ cd test

# These are the same command-line arguments that are passed in the Xcode scheme.
# If the scheme is changed, these should be updated too.
../proj/xc12/build/Release/boe_test -i --order lex
../proj/xc$1/build/Release/boe_test -i --order lex
2 changes: 1 addition & 1 deletion .github/workflows/scripts/mac/xcode-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -o pipefail

xcodebuild ARCHS=x86_64 -project proj/xc12/BoE.xcodeproj -alltargets -configuration Release |
xcodebuild ARCHS=x86_64 -project proj/xc$1/BoE.xcodeproj -alltargets -configuration Debug |
tee build.log |
xcpretty --color

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scripts/win/install-deps.bat
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

vcpkg install zlib:%1-windows sfml:%1-windows opengl:%1-windows boost-any:%1-windows boost-dynamic-bitset:%1-windows boost-ptr-container:%1-windows boost-core:%1-windows boost-filesystem:%1-windows boost-system:%1-windows boost-date-time:%1-windows boost-chrono:%1-windows boost-math:%1-windows
vcpkg install zlib:%1-windows sfml:%1-windows opengl:%1-windows boost-any:%1-windows boost-dynamic-bitset:%1-windows boost-ptr-container:%1-windows boost-core:%1-windows boost-filesystem:%1-windows boost-system:%1-windows boost-date-time:%1-windows boost-chrono:%1-windows boost-math:%1-windows boost-spirit:%1-windows
2,835 changes: 2,835 additions & 0 deletions proj/xc14/BoE.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
68 changes: 68 additions & 0 deletions proj/xc14/BoE.xcodeproj/xcshareddata/xcschemes/All.xcscheme
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "NO"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "91EBE9DA0F9A33A1002356F2"
BuildableName = "All"
BlueprintName = "All"
ReferencedContainer = "container:BoE.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "YES"
debugDocumentVersioning = "NO"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2BF04AC00BF518D4006C0831"
BuildableName = "Blades of Exile.app"
BlueprintName = "Blades of Exile"
ReferencedContainer = "container:BoE.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "91B3EF170F969C2200BF5B67"
BuildableName = "BoE Character Editor.app"
BlueprintName = "Blades of Exile Character Editor"
ReferencedContainer = "container:BoE.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "91B3EF170F969C2200BF5B67"
BuildableName = "BoE Character Editor.app"
BlueprintName = "Blades of Exile Character Editor"
ReferencedContainer = "container:BoE.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "YES"
debugDocumentVersioning = "NO"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "91B3EF170F969C2200BF5B67"
BuildableName = "BoE Character Editor.app"
BlueprintName = "Blades of Exile Character Editor"
ReferencedContainer = "container:BoE.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "91B3EF170F969C2200BF5B67"
BuildableName = "BoE Character Editor.app"
BlueprintName = "Blades of Exile Character Editor"
ReferencedContainer = "container:BoE.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1240"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2BF04AC00BF518D4006C0831"
BuildableName = "Blades of Exile.app"
BlueprintName = "Blades of Exile"
ReferencedContainer = "container:BoE.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2BF04AC00BF518D4006C0831"
BuildableName = "Blades of Exile.app"
BlueprintName = "Blades of Exile"
ReferencedContainer = "container:BoE.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "YES"
debugDocumentVersioning = "NO"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2BF04AC00BF518D4006C0831"
BuildableName = "Blades of Exile.app"
BlueprintName = "Blades of Exile"
ReferencedContainer = "container:BoE.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Debug"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "2BF04AC00BF518D4006C0831"
BuildableName = "Blades of Exile.app"
BlueprintName = "Blades of Exile"
ReferencedContainer = "container:BoE.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Loading
Loading