-
Notifications
You must be signed in to change notification settings - Fork 217
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Release 2.1.0 * Removed CHANGES in favour of release notes of github * continue on failure on openssl macos matrix * using brew prefix instead of static path for openssl libs on macos * Adjusted pkgconfig path in macos to use brew --prefix tool * Increased codecov upload timeout
- Loading branch information
1 parent
46bfa95
commit c7d2b57
Showing
5 changed files
with
15 additions
and
110 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -88,13 +88,7 @@ jobs: | |
./tests/run_tests.sh | ||
- name: Capture code coverage | ||
timeout-minutes: 3 | ||
if: matrix.platform == 'ubuntu-latest' | ||
run: | | ||
make code-coverage-capture | ||
- name: Capture code coverage | ||
timeout-minutes: 3 | ||
timeout-minutes: 6 | ||
if: matrix.platform == 'ubuntu-latest' | ||
run: | | ||
make code-coverage-capture | ||
|
@@ -105,12 +99,13 @@ jobs: | |
matrix: | ||
openssl: ["1.1", "3.0"] | ||
runs-on: macos-latest | ||
continue-on-error: true | ||
steps: | ||
- uses: actions/checkout@v1 | ||
- name: Install dependencies | ||
run: brew install autoconf automake libtool libevent pkg-config openssl@${{ matrix.openssl }} | ||
- name: Build | ||
run: autoreconf -ivf && PKG_CONFIG_PATH=/usr/local/opt/openssl@${{ matrix.openssl }}/lib/pkgconfig ./configure && make | ||
run: autoreconf -ivf && PKG_CONFIG_PATH=`brew --prefix openssl@${{ matrix.openssl }}`/lib/pkgconfig ./configure && make | ||
|
||
build-macos-openssl-1-0-2: | ||
strategy: | ||
|
@@ -124,4 +119,4 @@ jobs: | |
- name: Install openssl v1.0.2 | ||
run: brew install rbenv/tap/[email protected] | ||
- name: Build | ||
run: autoreconf -ivf && PKG_CONFIG_PATH=/usr/local/opt/[email protected]/lib/pkgconfig ./configure && make | ||
run: autoreconf -ivf && PKG_CONFIG_PATH=`brew --prefix [email protected]`/lib/pkgconfig ./configure && make |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -91,7 +91,7 @@ When running `./configure`, if it fails to find libssl it may be necessary to | |
tweak the `PKG_CONFIG_PATH` environment variable: | ||
|
||
``` | ||
PKG_CONFIG_PATH=/usr/local/opt/[email protected]/lib/pkgconfig ./configure | ||
PKG_CONFIG_PATH=`brew --prefix [email protected]`/lib/pkgconfig ./configure | ||
``` | ||
|
||
#### Building and installing | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU General Public License | |
dnl along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
|
||
AC_PREREQ(2.59) | ||
AC_INIT(memtier_benchmark,2.0.0,[email protected]) | ||
AC_INIT(memtier_benchmark,2.1.0,[email protected]) | ||
AC_CONFIG_SRCDIR([memtier_benchmark.cpp]) | ||
AC_CONFIG_HEADER([config.h]) | ||
AM_INIT_AUTOMAKE | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters