mirror of
https://github.com/eosswedenorg/antelope-keygen
synced 2026-07-02 11:43:40 +02:00
Github Actions: Remove OpenSSL from firedaemon on windows (its bundled).
This commit is contained in:
parent
7266699db9
commit
aa2fd02884
2 changed files with 1 additions and 19 deletions
12
.github/workflows/ci.yml
vendored
12
.github/workflows/ci.yml
vendored
|
|
@ -26,14 +26,9 @@ jobs:
|
||||||
mkdir -p build
|
mkdir -p build
|
||||||
if [ "$RUNNER_OS" == "macOS" ]; then
|
if [ "$RUNNER_OS" == "macOS" ]; then
|
||||||
brew install openssl
|
brew install openssl
|
||||||
elif [ "$RUNNER_OS" == "Windows" ]; then
|
|
||||||
cd build
|
|
||||||
curl https://mirror.firedaemon.com/OpenSSL/openssl-1.1.1e-dev.zip -O
|
|
||||||
7z x openssl-1.1.1e-dev.zip
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Configure (nix)
|
- name: Configure
|
||||||
if: runner.os != 'Windows'
|
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
if [ "$RUNNER_OS" == "macOS" ]; then
|
if [ "$RUNNER_OS" == "macOS" ]; then
|
||||||
|
|
@ -41,11 +36,6 @@ jobs:
|
||||||
fi
|
fi
|
||||||
cd build && cmake ${SSL_OPTS} ${{matrix.build-opts}} ..
|
cd build && cmake ${SSL_OPTS} ${{matrix.build-opts}} ..
|
||||||
|
|
||||||
- name: Configure (win)
|
|
||||||
if: runner.os == 'Windows'
|
|
||||||
# cmake in windows bash can't find openssl. so we use windows cli.
|
|
||||||
run: cd build; cmake ${{matrix.build-opts}} -D OPENSSL_ROOT_DIR="$pwd\openssl-1.1\x64" ..
|
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
shell: bash
|
shell: bash
|
||||||
run: cmake --build build
|
run: cmake --build build
|
||||||
|
|
|
||||||
8
.github/workflows/package.yml
vendored
8
.github/workflows/package.yml
vendored
|
|
@ -43,14 +43,6 @@ jobs:
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v1
|
- uses: actions/checkout@v1
|
||||||
|
|
||||||
- name: Dependancies
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
mkdir -p build
|
|
||||||
cd build
|
|
||||||
curl https://mirror.firedaemon.com/OpenSSL/openssl-1.1.1e-dev.zip -O
|
|
||||||
7z x openssl-1.1.1e-dev.zip
|
|
||||||
|
|
||||||
- name: Configure
|
- name: Configure
|
||||||
run: |
|
run: |
|
||||||
if ("${{matrix.arch}}" -eq "x86") {
|
if ("${{matrix.arch}}" -eq "x86") {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue