Skip to content

Commit

Permalink
Version bump: 2.1.0 (#256)
Browse files Browse the repository at this point in the history
* 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
filipecosta90 committed May 2, 2024
1 parent 46bfa95 commit c7d2b57
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 110 deletions.
13 changes: 4 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand All @@ -124,4 +119,4 @@ jobs:
- name: Install openssl v1.0.2
run: brew install rbenv/tap/openssl@1.0
- name: Build
run: autoreconf -ivf && PKG_CONFIG_PATH=/usr/local/opt/openssl@1.0/lib/pkgconfig ./configure && make
run: autoreconf -ivf && PKG_CONFIG_PATH=`brew --prefix openssl@1.0`/lib/pkgconfig ./configure && make
97 changes: 0 additions & 97 deletions CHANGES

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/openssl@3.0/lib/pkgconfig ./configure
PKG_CONFIG_PATH=`brew --prefix openssl@3.0`/lib/pkgconfig ./configure
```

#### Building and installing
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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,oss@redis.com)
AC_INIT(memtier_benchmark,2.1.0,oss@redis.com)
AC_CONFIG_SRCDIR([memtier_benchmark.cpp])
AC_CONFIG_HEADER([config.h])
AM_INIT_AUTOMAKE
Expand Down
11 changes: 9 additions & 2 deletions memtier_benchmark.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.1.
.TH MEMTIER_BENCHMARK "1" "June 2023" "memtier_benchmark 2.0.0" "User Commands"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3.
.TH MEMTIER_BENCHMARK "1" "April 2024" "memtier_benchmark 2.1.0" "User Commands"
.SH NAME
memtier_benchmark \- NoSQL benchmark tool
.SH SYNOPSIS
Expand Down Expand Up @@ -53,6 +53,9 @@ Use specified CA certs bundle for TLS
\fB\-\-tls\-skip\-verify\fR
Skip verification of server certificate
.TP
\fB\-\-tls\-protocols\fR
Specify the tls protocol version to use, comma delemited. Use a combination of 'TLSv1', 'TLSv1.1', 'TLSv1.2' and 'TLSv1.3'.
.TP
\fB\-\-sni\fR=\fI\,STRING\/\fR
Add an SNI header
.TP
Expand Down Expand Up @@ -97,6 +100,10 @@ Display version information
Number of total requests per client (default: 10000)
use 'allkeys' to run on the entire key\-range
.TP
\fB\-\-rate\-limiting\fR=\fI\,NUMBER\/\fR
The max number of requests to make per second from an individual connection (default is unlimited rate).
If you use \fB\-\-rate\-limiting\fR and a very large rate is entered which cannot be met, memtier will do as many requests as possible per second.
.TP
\fB\-c\fR, \fB\-\-clients\fR=\fI\,NUMBER\/\fR
Number of clients per thread (default: 50)
.TP
Expand Down

0 comments on commit c7d2b57

Please sign in to comment.