From fb92e6a28a11ed004e7453c8a9fb6dbb18c48c0d Mon Sep 17 00:00:00 2001 From: John Sully Date: Wed, 22 Apr 2020 00:55:31 -0400 Subject: [PATCH 1/3] CI syntax error fix Former-commit-id: 0845620384c08a3f937655931775a20728b19526 --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8fafa7c27..739d0c9bb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - with: + with: submodules: true - name: make run: | @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-16.04 steps: - uses: actions/checkout@v1 - with: + with: submodules: true - name: make run: | @@ -33,7 +33,7 @@ jobs: runs-on: macos-latest steps: - uses: actions/checkout@v1 - with: + with: submodules: true - name: make run: make From 210d872af4a1d6a0d81f0770b04f0089c9c861f0 Mon Sep 17 00:00:00 2001 From: John Sully Date: Wed, 22 Apr 2020 01:04:29 -0400 Subject: [PATCH 2/3] Don't show trial warning on license disabled builds Former-commit-id: 08fd74360d1e0196db7a6b52717500325533576c --- src/server.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/server.cpp b/src/server.cpp index 1f465927c..de049077f 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -5129,8 +5129,10 @@ void redisAsciiArt(void) { if (cserver.license_key == nullptr) { +#ifndef NO_LICENSE_CHECK serverLog(LL_WARNING, "!!!! KeyDB Pro is being run in trial mode !!!!"); serverLog(LL_WARNING, "!!!! Execution will terminate in %d minutes !!!!", cserver.trial_timeout); +#endif } zfree(buf); } From 5980d7bd6442f1800719126bc8bd1abf83c9c3aa Mon Sep 17 00:00:00 2001 From: John Sully Date: Wed, 22 Apr 2020 01:05:24 -0400 Subject: [PATCH 3/3] Don't CI build Pro on MacOS Former-commit-id: aaed87516ea9f428ebea286dd936dd219691b4f6 --- .github/workflows/ci.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8fafa7c27..0a3a3c75b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,11 +29,3 @@ jobs: sudo apt-get install uuid-dev libcurl4-openssl-dev make - build-macos-latest: - runs-on: macos-latest - steps: - - uses: actions/checkout@v1 - with: - submodules: true - - name: make - run: make