Skip to content

Commit d37d788

Browse files
committed
Debugging OpenSSL locations for actions
Also added so LibDataChannel always gets cached
1 parent b3d4e2f commit d37d788

3 files changed

Lines changed: 19 additions & 5 deletions

File tree

.github/workflows/build.yml

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ jobs:
2323
- name: Install CMake
2424
uses: ssrobins/install-cmake@v1
2525

26-
- name: Cache LibDataChannel
27-
id: cache-libdatachannel
28-
uses: actions/cache@v4
26+
- name: Restore Cache LibDataChannel
27+
id: cache-libdatachannel-restore
28+
uses: actions/cache/restore@v4
2929
with:
3030
path: 'C:/Program Files (x86)/libdatachannel'
3131
key: ${{ runner.os }}-libdatachannel
@@ -61,14 +61,27 @@ jobs:
6161
buckets: extras
6262
apps: nsis
6363

64-
- name: Pacakge NSIS
64+
- name: Get OpenSSL location
65+
run: |
66+
where libcrypto-3-x64.dll
67+
where libssl-3-x64.dll
68+
69+
- name: Package NSIS
6570
working-directory: ${{ github.workspace }}/client/build
6671
run: cpack .
6772

6873
- uses: actions/upload-artifact@v4
6974
with:
7075
path: ${{ github.workspace }}/client/build/Sharity-*-win64.exe
7176

77+
- name: Save Cache LibDataChannel
78+
id: cache-libdatachannel-save
79+
uses: actions/cache/save@v4
80+
if: always() && steps.cache-libdatachannel-restore.outputs.cache-hit != 'true'
81+
with:
82+
path: 'C:/Program Files (x86)/libdatachannel'
83+
key: ${{ runner.os }}-libdatachannel
84+
7285
build-linux:
7386
name: Build Linux
7487
runs-on: ubuntu-latest

client/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ endif()
4949
find_package(Qt6 REQUIRED COMPONENTS Core Concurrent Gui Widgets Quick Qml LinguistTools)
5050
qt_standard_project_setup(
5151
I18N_SOURCE_LANGUAGE en_GB
52-
I18N_TRANSLATED_LANGUAGES sv_SE de_DE fr_FR)
52+
I18N_TRANSLATED_LANGUAGES sv_SE de_DE)
5353

5454
if (QT_KNOWN_POLICY_QTP0004)
5555
qt_policy(SET QTP0004 NEW)

client/cmake/ConfigureCPack.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ if (WIN32)
1212
RUNTIME_DEPENDENCY_SET DATACHANNEL_SET
1313
PRE_EXCLUDE_REGEXES "api-ms-" "ext-ms-" "hvsifiletrust" "C:/msys64/mingw64/bin.*" ".*/msys64/mingw64/bin.*"
1414
POST_EXCLUDE_REGEXES ".*system32/.*\\.dll" ".*/msys64/mingw64/bin.*"
15+
POST_INCLUDE_FILES "C:/windows/system32/libssl-3-x64.dll" "C:/windows/system32/libcrypto-3-x64.dll" # There should be a better way than to force include OpenSSL
1516
LIBRARY DESTINATION bin)
1617
endif ()
1718

0 commit comments

Comments
 (0)