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.

Sign up for GitHub

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

Jump to bottom

Adapt build from avogadroapp to include OpenSSL dll for Windows #1604

Merged
merged 4 commits into from
Feb 10, 2024
Merged

Adapt build from avogadroapp to include OpenSSL dll for Windows #1604

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1e09d5c
Adapt build from avogadroapp to include OpenSSL dll for Windows
ghutchis Feb 8, 2024
6dacdb4
Make sure to use the correct path to the OpenSSL install
ghutchis Feb 8, 2024
1bcd3de
Investigate installed OpenSSL on Windows
ghutchis Feb 9, 2024
79f0a83
Skip OpenSSL v3 install
ghutchis Feb 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 7 additions & 13 deletions .github/workflows/build_cmake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
os: windows-latest,
cc: "cl", cxx: "cl",
build_type: "Release",
cmake_flags: "-DOPENSSL_ROOT_DIR=D:\\a\\Tools\\OpenSSL\\Win_x64",
cmake_flags: "",
build_flags: "-j 2",
cpack_flags: "-G NSIS",
}
Expand Down Expand Up @@ -130,20 +130,10 @@ jobs:
- name: Install Qt
uses: jurplel/install-qt-action@v3
with:
cache: True
aqtversion: '==3.1.*'
cache: true
version: ${{ env.QT_VERSION }}

- name: Install OpenSSL (Win64)
if: runner.os == 'Windows'
uses: jurplel/install-qt-action@v3
with:
cache: True
tools: 'tools_opensslv3_x64'
version: ${{ env.QT_VERSION }}
host: 'windows'
target: 'desktop'
arch: 'win64_msvc2019_64'

- name: Configure MSVC Command Prompt
if: runner.os == 'Windows'
uses: ilammy/msvc-dev-cmd@v1
Expand Down Expand Up @@ -268,12 +258,16 @@ jobs:
if [ -z "${P12_PASSWORD}" ]; then
unset CODESIGN_IDENTITY # to prevent cpack failing when trying to sign
fi
if [ -z "${OPENSSL_ROOT_DIR}" ]; then
unset OPENSSL_ROOT_DIR
fi
[[ ! "${GITHUB_REF}" =~ "tags" ]] && export SNAPSHOT_DATE=`date -j "+%d-%m-%y"`
cpack ${{ matrix.config.cpack_flags }}
working-directory: ${{ runner.workspace }}/build/avogadroapp
env:
P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
CODESIGN_IDENTITY: ${{ secrets.CODESIGN_ID }}
OPENSSL_ROOT_DIR: ${{ matrix.config.ssl_env }}

- name: AppImage
if: matrix.config.os == 'ubuntu-20.04' && matrix.config.build_type == 'Release'
Expand Down