From 7c525aa6918e45cb0fab2d9a21e3e477a46e9a8d Mon Sep 17 00:00:00 2001 From: rafie Date: Mon, 2 Sep 2019 08:57:35 +0300 Subject: [PATCH 1/5] CI Deploy: cp instead of ln to workspace --- opt/pack.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/opt/pack.sh b/opt/pack.sh index 1e3167e59..53dd48475 100755 --- a/opt/pack.sh +++ b/opt/pack.sh @@ -121,15 +121,15 @@ pack_ramp [[ $DEPS == 1 ]] && pack_deps if [[ ! -z $INTO ]]; then - mkdir -p $INTO/release $INTO/branch - cd $INTO/release + cd $INTO + mkdir -p release branch + for f in $RELEASE_ARTIFACTS; do - [[ -f $BINDIR/$f ]] && ln -sf $(realpath --relative-to . $BINDIR/$f) $(basename $f) + [[ -f $BINDIR/$f ]] && cp $BINDIR/$f release/ done - cd $INTO/branch for f in $DEV_ARTIFACTS; do - [[ -f $BINDIR/$f ]] && ln -sf $(realpath --relative-to . $BINDIR/$f) $(basename $f) + [[ -f $BINDIR/$f ]] && cp $BINDIR/$f branch/ done fi From f2a32fc49f248c24ee07de68b6f4101f7089e493 Mon Sep 17 00:00:00 2001 From: rafie Date: Mon, 2 Sep 2019 09:04:24 +0300 Subject: [PATCH 2/5] CI Deploy: cp instead of ln to workspace #2 --- opt/pack.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/opt/pack.sh b/opt/pack.sh index 53dd48475..ba3849e6f 100755 --- a/opt/pack.sh +++ b/opt/pack.sh @@ -121,8 +121,9 @@ pack_ramp [[ $DEPS == 1 ]] && pack_deps if [[ ! -z $INTO ]]; then + mkdir -p $INTO cd $INTO - mkdir -p release branch + mkdir release branch for f in $RELEASE_ARTIFACTS; do [[ -f $BINDIR/$f ]] && cp $BINDIR/$f release/ From def2b7bb83c525d133fdfeeeeb1640a04733897d Mon Sep 17 00:00:00 2001 From: rafie Date: Mon, 2 Sep 2019 11:36:50 +0300 Subject: [PATCH 3/5] CI Deploy: workspace issues #3 --- .circleci/config.yml | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ce74da557..c0944facc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,21 +30,21 @@ commands: - run: name: Test command: | - mkdir -p ~/workspace/tests + mkdir -p /workspace/tests make -C opt test SHOW=1 - cp test/logs/* ~/workspace/tests + cp test/logs/* /workspace/tests - run: name: Package - command: make -C opt pack BRANCH="${CIRCLE_BRANCH//[^A-Za-z0-9._-]/_}" INTO=~/workspace/packages SHOW=1 + command: make -C opt pack BRANCH="${CIRCLE_BRANCH//[^A-Za-z0-9._-]/_}" INTO=/workspace/packages SHOW=1 - persist_to_workspace: - root: ~/workspace + root: /workspace paths: - 'packages/release/*.zip' - 'packages/release/*.tgz' - 'packages/branch/*.zip' - 'packages/branch/*.tgz' - store_test_results: - path: ~/workspace/tests + path: /workspace/tests deploy: parameters: from: @@ -69,6 +69,11 @@ jobs: macos: xcode: 10.2.1 steps: + - run: + name: Set up workspace + command: >- + sudo mkdir -p /workspace; + sudo chown $USER /workspace - ci_steps: platform: macosx @@ -80,11 +85,11 @@ jobs: - image: 'redislabsmodules/rmbuilder:latest' steps: - attach_workspace: - at: ~/workspace + at: /workspace - deploy: - from: ~/workspace/packages/<> + from: /workspace/packages/<> - store_artifacts: - path: ~/workspace/packages/<> + path: /workspace/packages/<> deploy_docs: docker: From 093b9ebb9a5094a4c0e2ebee17caac56251e09fd Mon Sep 17 00:00:00 2001 From: rafie Date: Mon, 2 Sep 2019 11:48:39 +0300 Subject: [PATCH 4/5] CI Deploy: workspace issues #4 --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c0944facc..d46fc2fbb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,6 +24,11 @@ commands: paths: - deps key: v1-dependencies-{{ checksum "get_deps.sh" }} + - run: + name: Set up workspace + command: | + sudo mkdir -p /workspace + sudo chown $USER /workspace - run: name: Build command: make -C opt all SHOW=1 @@ -69,11 +74,6 @@ jobs: macos: xcode: 10.2.1 steps: - - run: - name: Set up workspace - command: >- - sudo mkdir -p /workspace; - sudo chown $USER /workspace - ci_steps: platform: macosx From 315f2d58216f5e78bd409f600b7789858c86d2bd Mon Sep 17 00:00:00 2001 From: rafie Date: Mon, 2 Sep 2019 11:58:51 +0300 Subject: [PATCH 5/5] CI Deploy: workspace issues #5 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d46fc2fbb..fe7dd106e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,7 +28,7 @@ commands: name: Set up workspace command: | sudo mkdir -p /workspace - sudo chown $USER /workspace + sudo chown `whoami` /workspace - run: name: Build command: make -C opt all SHOW=1