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

Update libs #1236

Merged
merged 1 commit into from
Jan 23, 2024
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
7 changes: 2 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ permissions:
contents: read
env:
BUILD_NUMBER: ${{ github.run_number }}
MAKEFLAGS: -j3
jobs:
macos:
name: Build on macOS
Expand Down Expand Up @@ -106,8 +105,6 @@ jobs:
strategy:
matrix:
container: ['fedora:37', 'fedora:38']
env:
MAKEFLAGS: -j3
steps:
- name: Install Deps
run: |
Expand Down Expand Up @@ -172,12 +169,12 @@ jobs:
uses: lukka/run-vcpkg@v7
with:
vcpkgArguments: openssl zlib flatbuffers
vcpkgGitCommitId: 6a349fe1fbea1e5fcda2e0775f555d829a5e82df
vcpkgGitCommitId: 18b028fe785e707265fa0e35590b7537ae1d12ea
vcpkgTriplet: x64-windows
- name: Install Qt
uses: jurplel/install-qt-action@v3
with:
version: 6.5.3
version: 6.6.1
arch: win64_msvc2019_64
modules: qt5compat
- name: Setup dev env
Expand Down
3 changes: 3 additions & 0 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ Build-Depends:
libldap2-dev,
libpcsclite-dev,
libssl-dev,
libflatbuffers-dev,
flatbuffers-compiler-dev,
zlib1g-dev,
qt6-tools-dev | qttools5-dev,
qt6-l10n-tools | qttools5-dev-tools,
libqt6svg6-dev | libqt5svg5-dev
Expand Down
4 changes: 2 additions & 2 deletions prepare_osx_build_environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
set -e

######### Versions of libraries/frameworks to be compiled
QT_VER="6.5.3"
OPENSSL_VER="3.0.11"
QT_VER="6.6.1"
OPENSSL_VER="3.0.12"
OPENLDAP_VER="2.6.6"
REBUILD=false
BUILD_PATH=~/cmake_builds
Expand Down