Skip to content

Commit c843a4c

Browse files
committed
CircleCI fixes #2
1 parent 9037f4e commit c843a4c

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

.circleci/config.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,29 +27,29 @@ commands:
2727
- run:
2828
name: Set up workspace
2929
command: |
30-
sudo mkdir -p /workspace
31-
sudo chown `whoami` /workspace
30+
sudo mkdir -p ~/workspace
31+
sudo chown `whoami` ~/workspace
3232
- run:
3333
name: Build
3434
command: make -C opt all SHOW=1
3535
- run:
3636
name: Test
3737
command: |
38-
mkdir -p /workspace/tests
38+
mkdir -p ~/workspace/tests
3939
make -C opt test SHOW=1
40-
cp test/logs/* /workspace/tests
40+
cp test/logs/* ~/workspace/tests
4141
- run:
4242
name: Package
43-
command: make -C opt pack BRANCH="${CIRCLE_BRANCH//[^A-Za-z0-9._-]/_}" INTO=/workspace/packages SHOW=1
43+
command: make -C opt pack BRANCH="${CIRCLE_BRANCH//[^A-Za-z0-9._-]/_}" INTO=~/workspace/packages SHOW=1
4444
- persist_to_workspace:
45-
root: /workspace
45+
root: ~/workspace
4646
paths:
4747
- 'packages/release/*.zip'
4848
- 'packages/release/*.tgz'
4949
- 'packages/branch/*.zip'
5050
- 'packages/branch/*.tgz'
5151
- store_test_results:
52-
path: /workspace/tests
52+
path: ~/workspace/tests
5353
deploy:
5454
parameters:
5555
from:
@@ -99,15 +99,15 @@ jobs:
9999
- image: 'redislabsmodules/rmbuilder:latest'
100100
steps:
101101
- attach_workspace:
102-
at: /workspace
102+
at: ~/workspace
103103
- deploy:
104-
from: /workspace/packages/<<parameters.package>>
104+
from: ~/workspace/packages/<<parameters.package>>
105105
- store_artifacts:
106-
path: /workspace/packages/<<parameters.package>>
106+
path: ~/workspace/packages/<<parameters.package>>
107107

108108
deploy_docs:
109109
docker:
110-
- image: 'redislabsmodules/rmbuilder:latest'
110+
- image: redislabsmodules/rmbuilder:latest
111111
steps:
112112
- checkout
113113
- run:

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
2020
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
2121

2222
# For adding specific Release flags
23-
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Wno-cast-function-type -Werror -O3")
24-
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wno-cast-function-type -Werror -O3")
23+
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3")
24+
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3")
2525

2626
# Add -fno-omit-frame-pointer to avoid seeing incomplete stack traces
2727
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g -ggdb -fno-omit-frame-pointer")

0 commit comments

Comments
 (0)