Skip to content

Commit a6efa4f

Browse files
committed
Test changes on all runners
1 parent f11f20b commit a6efa4f

File tree

2 files changed

+56
-65
lines changed

2 files changed

+56
-65
lines changed

.github/workflows/app_build.yml

Lines changed: 55 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -42,63 +42,62 @@ jobs:
4242
# fail-fast: Default is true, switch to false to allow one platform to fail and still run others
4343
fail-fast: false
4444
matrix:
45-
#os: [ubuntu-20.04, ubuntu-22.04, windows-2022, macos-13, macos-arm64]
46-
os: [macos-arm64]
45+
os: [ubuntu-20.04, ubuntu-22.04, windows-2022, macos-13, macos-arm64]
4746
include:
48-
#- os: ubuntu-20.04
49-
# SELF_HOSTED: false
50-
# PLATFORM_NAME: Linux
51-
# CPACK_BINARY_DEB: ON
52-
# CPACK_BINARY_IFW: OFF
53-
# CPACK_BINARY_TGZ: ON
54-
# CPACK_BINARY_ZIP: OFF
55-
# BINARY_EXT: deb
56-
# COMPRESSED_EXT: tar.gz
57-
# BINARY_PKG_PATH: _CPack_Packages/Linux/DEB
58-
# COMPRESSED_PKG_PATH: _CPack_Packages/Linux/TGZ
59-
# QT_OS_NAME: linux
60-
# QT_ARCH: gcc_64
61-
#- os: ubuntu-22.04
62-
# SELF_HOSTED: false
63-
# PLATFORM_NAME: Linux
64-
# CPACK_BINARY_DEB: ON
65-
# CPACK_BINARY_IFW: OFF
66-
# CPACK_BINARY_TGZ: ON
67-
# CPACK_BINARY_ZIP: OFF
68-
# BINARY_EXT: deb
69-
# COMPRESSED_EXT: tar.gz
70-
# BINARY_PKG_PATH: _CPack_Packages/Linux/DEB
71-
# COMPRESSED_PKG_PATH: _CPack_Packages/Linux/TGZ
72-
# QT_OS_NAME: linux
73-
# QT_ARCH: gcc_64
74-
#- os: windows-2022
75-
# SELF_HOSTED: false
76-
# PLATFORM_NAME: Windows
77-
# CPACK_BINARY_DEB: OFF
78-
# CPACK_BINARY_IFW: ON
79-
# CPACK_BINARY_TGZ: OFF
80-
# CPACK_BINARY_ZIP: ON
81-
# BINARY_EXT: exe
82-
# COMPRESSED_EXT: zip
83-
# BINARY_PKG_PATH: _CPack_Packages/win64/IFW
84-
# COMPRESSED_PKG_PATH: _CPack_Packages/win64/ZIP
85-
# QT_OS_NAME: windows
86-
# QT_ARCH: win64_msvc2019_64
87-
#- os: macos-13
88-
# SELF_HOSTED: false
89-
# PLATFORM_NAME: Darwin
90-
# CPACK_BINARY_DEB: OFF
91-
# CPACK_BINARY_IFW: ON
92-
# CPACK_BINARY_TGZ: ON
93-
# CPACK_BINARY_ZIP: OFF
94-
# BINARY_EXT: dmg
95-
# COMPRESSED_EXT: tar.gz
96-
# BINARY_PKG_PATH: _CPack_Packages/Darwin/IFW
97-
# COMPRESSED_PKG_PATH: _CPack_Packages/Darwin/TGZ
98-
# MACOSX_DEPLOYMENT_TARGET: 11.0
99-
# SDKROOT: /Applications/Xcode_15.0.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
100-
# QT_OS_NAME: mac
101-
# QT_ARCH: clang_64
47+
- os: ubuntu-20.04
48+
SELF_HOSTED: false
49+
PLATFORM_NAME: Linux
50+
CPACK_BINARY_DEB: ON
51+
CPACK_BINARY_IFW: OFF
52+
CPACK_BINARY_TGZ: ON
53+
CPACK_BINARY_ZIP: OFF
54+
BINARY_EXT: deb
55+
COMPRESSED_EXT: tar.gz
56+
BINARY_PKG_PATH: _CPack_Packages/Linux/DEB
57+
COMPRESSED_PKG_PATH: _CPack_Packages/Linux/TGZ
58+
QT_OS_NAME: linux
59+
QT_ARCH: gcc_64
60+
- os: ubuntu-22.04
61+
SELF_HOSTED: false
62+
PLATFORM_NAME: Linux
63+
CPACK_BINARY_DEB: ON
64+
CPACK_BINARY_IFW: OFF
65+
CPACK_BINARY_TGZ: ON
66+
CPACK_BINARY_ZIP: OFF
67+
BINARY_EXT: deb
68+
COMPRESSED_EXT: tar.gz
69+
BINARY_PKG_PATH: _CPack_Packages/Linux/DEB
70+
COMPRESSED_PKG_PATH: _CPack_Packages/Linux/TGZ
71+
QT_OS_NAME: linux
72+
QT_ARCH: gcc_64
73+
- os: windows-2022
74+
SELF_HOSTED: false
75+
PLATFORM_NAME: Windows
76+
CPACK_BINARY_DEB: OFF
77+
CPACK_BINARY_IFW: ON
78+
CPACK_BINARY_TGZ: OFF
79+
CPACK_BINARY_ZIP: ON
80+
BINARY_EXT: exe
81+
COMPRESSED_EXT: zip
82+
BINARY_PKG_PATH: _CPack_Packages/win64/IFW
83+
COMPRESSED_PKG_PATH: _CPack_Packages/win64/ZIP
84+
QT_OS_NAME: windows
85+
QT_ARCH: win64_msvc2019_64
86+
- os: macos-13
87+
SELF_HOSTED: false
88+
PLATFORM_NAME: Darwin
89+
CPACK_BINARY_DEB: OFF
90+
CPACK_BINARY_IFW: ON
91+
CPACK_BINARY_TGZ: ON
92+
CPACK_BINARY_ZIP: OFF
93+
BINARY_EXT: dmg
94+
COMPRESSED_EXT: tar.gz
95+
BINARY_PKG_PATH: _CPack_Packages/Darwin/IFW
96+
COMPRESSED_PKG_PATH: _CPack_Packages/Darwin/TGZ
97+
MACOSX_DEPLOYMENT_TARGET: 11.0
98+
SDKROOT: /Applications/Xcode_15.0.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
99+
QT_OS_NAME: mac
100+
QT_ARCH: clang_64
102101
- os: macos-arm64
103102
SELF_HOSTED: true
104103
PLATFORM_NAME: Darwin

ConanInstall.cmake

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -153,14 +153,6 @@ if(NOT CONAN_OPENSTUDIO_ALREADY_RUN)
153153
set(CONAN_OPENSSL "openssl/1.1.1o#213dbdeb846a4b40b4dec36cf2e673d7")
154154
endif()
155155

156-
if( APPLE AND ${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "arm64" )
157-
# most recent version of xcode gives error on boost 1.79.0:
158-
# " ./boost/unordered/detail/fwd.hpp:53:16: error: no member named 'piecewise_construct' in namespace 'std'; did you mean 'piecewise_construct_t'?"
159-
set(CONAN_BOOST "boost/1.79.0#f664bfe40e2245fa9baf1c742591d582")
160-
else()
161-
set(CONAN_BOOST "boost/1.79.0#f664bfe40e2245fa9baf1c742591d582")
162-
endif()
163-
164156
message(STATUS "Conan: conan_cmake_configure")
165157
# This will create the conanfile.txt
166158
conan_cmake_configure(
@@ -170,7 +162,7 @@ if(NOT CONAN_OPENSTUDIO_ALREADY_RUN)
170162
${CONAN_GMP}
171163
${CONAN_RUBY}
172164
${CONAN_OPENSSL}
173-
${CONAN_BOOST}
165+
"boost/1.79.0#f664bfe40e2245fa9baf1c742591d582"
174166
"pugixml/1.12.1#5a39f82651eba3e7d6197903a3202e21"
175167
"libxml2/2.9.14#fc433aeebfe525657d73334c61f96944"
176168
"libxslt/1.1.34#9085031f5b9b2bb328ad615cd1bf1282"

0 commit comments

Comments
 (0)