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
12 changes: 6 additions & 6 deletions .github/workflows/app_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ jobs:

begin_group "Default profile"
if [ "${{ matrix.SELF_HOSTED }}" == "true" ]; then
export CONAN_USER_HOME=$HOME
export CONAN_USER_HOME=$HOME${DIR_SEP}actions-runner${DIR_SEP}conan-cache
else
export CONAN_USER_HOME="${{ github.workspace }}${DIR_SEP}conan-cache"
fi;
Expand Down Expand Up @@ -404,6 +404,7 @@ jobs:
if: ${{ matrix.SELF_HOSTED }}
run: |
set -x
cmake -E rm -rf ./build
cmake -E make_directory ./build

if [ "$RUNNER_OS" == "macOS" ]; then
Expand Down Expand Up @@ -490,19 +491,18 @@ jobs:
conan cache clean --source --build --download --temp
ccache --show-stats -vv || ccache --show-stats || true

- name: Test bed Sign inner portable executable files and exe package (Windows 2022)
- name: Test bed Sign inner portable executable files and exe package (Windows)
working-directory: ./build
if: (matrix.os == 'windows-2022')
if: runner.os == 'Windows'
shell: powershell
run: |
$installer_exe = Get-ChildItem -Filter "${{ matrix.BINARY_PKG_PATH }}/*.${{ env.BINARY_EXT }}" -File | Select-Object -First 1 | % { $_.FullName}
echo $installer_exe
echo "$installer_exe"

- name: Sign inner portable executable files and exe package (Windows 2022)
- name: Sign inner portable executable files and exe package (Windows)
working-directory: ./build
# if: (runner.os == 'Windows')
if: contains(github.ref, 'refs/tags') && (matrix.os == 'windows-2022')
if: contains(github.ref, 'refs/tags') && (runner.os == 'Windows')
shell: powershell
run: |
# Install signpath
Expand Down
9 changes: 5 additions & 4 deletions conan.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
"websocketpp/0.8.2#842a0419153a8aa52f3ea3a1da557d38%1695972005.713",
"tinygltf/2.5.0#65c28d0a4c3cbd4ef92b08b59df769da%1701621757.442",
"termcap/1.3.1#1986f84bf21dd07ea774b027a3201fcb%1678542508.75",
"swig/4.1.1#8f418438101ef7712d52a9fe739d32f9%1707838298.077707",
"swig/4.1.1#8f418438101ef7712d52a9fe739d32f9%1707838669.551",
"stb/cci.20230920#9792498b81cf34a90138d239e36b0bf8%1700546289.605",
"sqlite3/3.38.5#4b875d4249cdfb4c1235e6b3ea6c18e7%1676251415.466",
"ruby/3.2.2#7a66613b28107b3318a6ff60701c1b6b%1707386606.655",
"ruby/3.2.2#e349279c358fd8f54d83446a3af8ecfe%1718616192.725",
"readline/8.2#5618fbfed2466d9dc0fa8834faf06a6a%1702837438.071",
"pugixml/1.12.1#d0378a7e4e32d2d379c3a272269e4330%1691917297.122",
"pcre2/10.42#74a354d74d291503aadffe6453d976f5%1694473548.558",
Expand Down Expand Up @@ -55,5 +55,6 @@
"boost/1.83.0": [
"boost/1.79.0#d8a5b9e748e4152d6f489d7d87a1f129"
]
}
}
},
"config_requires": []
}
2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class OpenStudioAppBuildRecipe(ConanFile):
}

def requirements(self):
self.requires("ruby/3.2.2")
self.requires("ruby/3.2.2#e349279c358fd8f54d83446a3af8ecfe%1718616192.725")

if is_apple_os(self):
self.requires(
Expand Down
1 change: 1 addition & 0 deletions src/bimserver/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ set(${target_name}_swig_src
set(${target_name}_depends
${Boost_LIBRARIES}
${CMAKE_THREAD_LIBS}
openstudio_modeleditor
openstudio::openstudiolib
${QT_LIBS}
)
Expand Down
6 changes: 3 additions & 3 deletions src/openstudio_lib/library/embeddable_geometry_editor.html

Large diffs are not rendered by default.