Skip to content

Commit 0fe8843

Browse files
authored
Update Qt 6.7.2 and OpenSSL 3.0.14 (#1273)
IB-8126 Signed-off-by: Raul Metsma <[email protected]>
1 parent 5da03fa commit 0fe8843

File tree

2 files changed

+13
-17
lines changed

2 files changed

+13
-17
lines changed

.github/workflows/build.yml

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
with:
1818
submodules: recursive
1919
- name: Download artifact
20-
uses: dawidd6/action-download-artifact@v3
20+
uses: dawidd6/action-download-artifact@v6
2121
with:
2222
workflow: build.yml
2323
branch: master
@@ -72,7 +72,7 @@ jobs:
7272
with:
7373
submodules: recursive
7474
- name: Download artifact
75-
uses: dawidd6/action-download-artifact@v3
75+
uses: dawidd6/action-download-artifact@v6
7676
with:
7777
workflow: build.yml
7878
branch: master
@@ -81,7 +81,7 @@ jobs:
8181
repo: open-eid/libdigidocpp
8282
- name: Install artifact
8383
run: |
84-
apt install --no-install-recommends -y ./libdigidocpp-pkg/*$(lsb_release -rs)*.deb
84+
apt install --no-install-recommends -y ./libdigidocpp-pkg/*.deb
8585
rm -rf libdigidocpp-pkg
8686
- name: Setup changelog
8787
run: |
@@ -122,17 +122,15 @@ jobs:
122122
with:
123123
submodules: recursive
124124
- name: Download artifact
125-
uses: dawidd6/action-download-artifact@v3
125+
uses: dawidd6/action-download-artifact@v6
126126
with:
127127
workflow: build.yml
128128
branch: master
129129
name: fedora_${{ matrix.container }}
130130
path: libdigidocpp-pkg
131131
repo: open-eid/libdigidocpp
132132
- name: Install artifact
133-
run: |
134-
. /etc/os-release
135-
dnf install -y ./libdigidocpp-pkg/*.rpm
133+
run: dnf install -y ./libdigidocpp-pkg/*.rpm
136134
- name: Build
137135
run: |
138136
cmake -DCMAKE_INSTALL_PREFIX=/usr -B build -S .
@@ -161,7 +159,7 @@ jobs:
161159
with:
162160
submodules: recursive
163161
- name: Download artifact
164-
uses: dawidd6/action-download-artifact@v3
162+
uses: dawidd6/action-download-artifact@v6
165163
with:
166164
workflow: build.yml
167165
branch: master
@@ -179,9 +177,9 @@ jobs:
179177
vcpkgGitCommitId: 18b028fe785e707265fa0e35590b7537ae1d12ea
180178
vcpkgTriplet: x64-windows
181179
- name: Install Qt
182-
uses: jurplel/install-qt-action@v3
180+
uses: jurplel/install-qt-action@v4
183181
with:
184-
version: 6.7.1
182+
version: 6.7.2
185183
arch: win64_msvc2019_64
186184
- name: Setup dev env
187185
uses: ilammy/msvc-dev-cmd@v1
@@ -193,8 +191,6 @@ jobs:
193191
wix extension -g add WixToolset.UI.wixext/5.0.0
194192
- name: Build
195193
run: |
196-
md build/client
197-
copy ${{ env.RUNVCPKG_VCPKG_ROOT }}\installed\x64-windows\bin\*.dll build\client\
198194
cmake "-GNinja" -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo `
199195
-DCMAKE_TOOLCHAIN_FILE=${{ env.RUNVCPKG_VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake `
200196
"-DLibDigiDocpp_ROOT=libs/PFiles64/libdigidocpp"
@@ -223,15 +219,15 @@ jobs:
223219
- name: Install dependencies
224220
run: sudo apt update -qq && sudo apt install --no-install-recommends -y cmake libldap2-dev gettext libpcsclite-dev libminizip-dev libxml-security-c-dev libgl-dev libqt6svg6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libflatbuffers-dev zlib1g-dev
225221
- name: Download artifact
226-
uses: dawidd6/action-download-artifact@v3
222+
uses: dawidd6/action-download-artifact@v6
227223
with:
228224
workflow: build.yml
229225
branch: master
230226
name: ubuntu_22.04
231227
path: libdigidocpp-pkg
232228
repo: open-eid/libdigidocpp
233229
- name: Install artifact
234-
run: sudo dpkg -i libdigidocpp-pkg/*$(lsb_release -rs)*.deb
230+
run: sudo dpkg -i libdigidocpp-pkg/*.deb
235231
- name: Download Coverity Build Tool
236232
run: |
237233
curl -s -d "token=$TOKEN&project=$PROJECTNAME" -o cov-analysis-linux64.tar.gz https://scan.coverity.com/download/cxx/linux64
@@ -267,7 +263,7 @@ jobs:
267263
- name: Install dependencies
268264
run: sudo apt update -qq && sudo apt install --no-install-recommends -y cmake libldap2-dev gettext libpcsclite-dev libminizip-dev libxml-security-c-dev libgl-dev libqt6svg6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libflatbuffers-dev zlib1g-dev
269265
- name: Download artifact
270-
uses: dawidd6/action-download-artifact@v3
266+
uses: dawidd6/action-download-artifact@v6
271267
with:
272268
workflow: build.yml
273269
branch: master

prepare_osx_build_environment.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
set -e
55

66
######### Versions of libraries/frameworks to be compiled
7-
QT_VER="6.7.1"
8-
OPENSSL_VER="3.0.13"
7+
QT_VER="6.7.2"
8+
OPENSSL_VER="3.0.14"
99
OPENLDAP_VER="2.6.8"
1010
REBUILD=false
1111
BUILD_PATH=~/cmake_builds

0 commit comments

Comments
 (0)