Skip to content

Commit

Permalink
CI: move over to OpenSSL 3; use apt to install deps on Linux
Browse files Browse the repository at this point in the history
  • Loading branch information
KitsuneRal committed Oct 23, 2023
1 parent a313422 commit e67807c
Showing 1 changed file with 19 additions and 17 deletions.
36 changes: 19 additions & 17 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,23 +56,26 @@ jobs:
with:
fetch-depth: 0

- name: Install Qt
# Install on Linux via apt to get everything necessary in one go
- name: Install dependencies (Linux)
if: startsWith(matrix.os, 'ubuntu')
run: |
COMMON_PKGS="libolm-dev ninja-build valgrind gnome-keyring"
sudo apt-get -qq update
sudo apt-get -qq install $COMMON_PKGS \
${{ matrix.qt-version == 5 && 'qtmultimedia5-dev qt5keychain-dev'
|| 'qtkeychain-qt6-dev'
}}
gnome-keyring-daemon -d --unlock <<<'' # Create a login keyring with no password
- name: Install dependencies (non-Linux)
if: "!startsWith(matrix.os, 'ubuntu')"
uses: jurplel/[email protected]
with:
version: '${{ matrix.qt-version }}.*'
cache: true
cache-key-prefix: Qt
tools: "tools_ninja${{ !startsWith(matrix.os, 'macos') && ' tools_openssl_x64' || '' }}"

- name: Install other dependencies (Linux)
if: startsWith(matrix.os, 'ubuntu')
run: |
sudo apt-get -qq install valgrind gnome-keyring
gnome-keyring-daemon -d --unlock <<<'' # Create a login keyring with no password
- name: Install other dependencies (macOS)
if: startsWith(matrix.os, 'macos') && matrix.e2ee
run: brew install openssl
tools: "tools_ninja${{ startsWith(matrix.os, 'windows') && ' tools_opensslv3_x64' || '' }}"

- name: Setup build environment
run: |
Expand Down Expand Up @@ -112,11 +115,10 @@ jobs:
if [ -n '${{ matrix.e2ee }}' ]; then
QUOTEST_ORIGIN="$QUOTEST_ORIGIN/E2EE"
if [ '${{ startsWith(runner.os, 'mac') }}' == 'true' ]; then
CMAKE_ARGS="$CMAKE_ARGS -DOPENSSL_ROOT_DIR=`brew --prefix [email protected]`"
else
CMAKE_ARGS="$CMAKE_ARGS -DOPENSSL_ROOT_DIR=$IQTA_TOOLS/OpenSSL/*/"
fi
CMAKE_ARGS="$CMAKE_ARGS \
${{ runner.os == 'macOS' && '-DOPENSSL_ROOT_DIR=`brew --prefix openssl`' ||
runner.os == 'Windows' && '-DOPENSSL_ROOT_DIR=$IQTA_TOOLS/OpenSSLv3/Win_x64/' || '' }} \
"
fi
if [ '${{ matrix.static-analysis }}' == 'sonar' ]; then
Expand Down

0 comments on commit e67807c

Please sign in to comment.