From 02c5a72924dd0290c3191b42e119f607d762600f Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Fri, 15 Jun 2018 15:00:47 -0400 Subject: [PATCH] the env var has an unexpanded ~ in it more trouble than it is worth --- .circleci/config.yml | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 45dd728dd..c33b484a4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -62,24 +62,21 @@ jobs: - run: &BOOTSTRAP_TEST_ENVIRONMENT name: "Bootstrap test environment" command: | - echo ${CIRCLE_WORKING_DIRECTORY}/.circleci/bootstrap-test-environment.sh - ls ${CIRCLE_WORKING_DIRECTORY}/.circleci/ - ls ${CIRCLE_WORKING_DIRECTORY}/ - ${CIRCLE_WORKING_DIRECTORY}/.circleci/bootstrap-test-environment.sh + ~/project/.circleci/bootstrap-test-environment.sh - run: &SETUP_VIRTUALENV name: "Setup virtualenv" # pip cannot install packages if the working directory is not # readable. working_directory: "/tmp" - command: "${CIRCLE_WORKING_DIRECTORY}/.circleci/setup-virtualenv.sh" + command: "~/project/.circleci/setup-virtualenv.sh" - run: &RUN_TESTS name: "Run test suite" # Something about when it re-uses an existing environment blows up # if the working directory is not readable. working_directory: "/tmp" - command: "${CIRCLE_WORKING_DIRECTORY}/.circleci/setup-virtualenv.sh" + command: "~/project/.circleci/setup-virtualenv.sh" - store_artifacts: &STORE_TEST_LOG # Despite passing --workdir /tmp to tox above, it still runs trial @@ -225,18 +222,15 @@ jobs: - run: <<: *BOOTSTRAP_TEST_ENVIRONMENT command: | - echo ${CIRCLE_WORKING_DIRECTORY}/.circleci/bootstrap-test-environment.sh - ls ${CIRCLE_WORKING_DIRECTORY}/ - ls ${CIRCLE_WORKING_DIRECTORY}/.circleci/ - sudo ${CIRCLE_WORKING_DIRECTORY}/.circleci/bootstrap-test-environment.sh + sudo ~/project/.circleci/bootstrap-test-environment.sh - run: <<: *SETUP_VIRTUALENV - command: "sudo ${CIRCLE_WORKING_DIRECTORY}/.circleci/setup-virtualenv.sh" + command: "sudo ~/project/.circleci/setup-virtualenv.sh" - run: <<: *RUN_TESTS - command: "sudo ${CIRCLE_WORKING_DIRECTORY}/.circleci/setup-virtualenv.sh" + command: "sudo ~/project/.circleci/setup-virtualenv.sh" - store_artifacts: *STORE_TEST_LOG - store_artifacts: *STORE_OTHER_ARTIFACTS