Skip to content
This repository was archived by the owner on Mar 23, 2021. It is now read-only.

Commit ff96d5e

Browse files
author
Franck Royer
authored
Merge branch 'master' into openssl-static
2 parents 0a14d2f + bd7d4d3 commit ff96d5e

File tree

46 files changed

+371
-607
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+371
-607
lines changed

.circleci/config.yml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -53,21 +53,9 @@ jobs:
5353
- install_rust
5454
- install_node_devlibs
5555
- print_current_versions
56-
- run:
57-
name: "Compile openssl static libs"
58-
command: |
59-
set -v
60-
cd ~/ && curl -O https://www.openssl.org/source/openssl-1.1.1c.tar.gz
61-
tar xaf openssl-1.1.1c.tar.gz
62-
mkdir ~/openssl
63-
cd openssl-1.1.1c && ./config --prefix=$HOME/openssl -static
64-
make
65-
make install
6656
- run:
6757
name: Release build and test using cargo make
6858
command: |
69-
export OPENSSL_DIR=$HOME/openssl/
70-
export OPENSSL_STATIC=1
7159
export CARGO_MAKE_CARGO_BUILD_TEST_FLAGS="--all --release"
7260
export BTSIEVE_BIN=~/comit/target/release/btsieve
7361
export CND_BIN=~/comit/target/release/cnd
@@ -133,7 +121,7 @@ commands:
133121
echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
134122
echo "deb https://deb.nodesource.com/node_10.x/ trusty main" | sudo tee /etc/apt/sources.list.d/node_10.list
135123
sudo apt-get update
136-
sudo apt-get install -y nodejs=10.* yarn libzmq3-dev
124+
sudo apt-get install -y nodejs=10.* yarn
137125
install_rust:
138126
steps:
139127
- run:

0 commit comments

Comments
 (0)