Skip to content

Commit

Permalink
There is no AGENT_TOOLSDIRECTORY on GitHub images (#21)
Browse files Browse the repository at this point in the history
  • Loading branch information
mjpieters authored May 5, 2020
1 parent e6805b9 commit f75c0e6
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions installers/nix-setup-template.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,14 @@ PYTHON_MAJOR_DOT_MINOR=python$MAJOR_VERSION.$MINOR_VERSION
PYTHON_MAJORMINOR=python$MAJOR_VERSION$MINOR_VERSION
PYTHON_FULL_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$BUILD_VERSION

PYTHON_TOOLCACHE_PATH=$AGENT_TOOLSDIRECTORY/Python
if [ -z ${AGENT_TOOLSDIRECTORY+x} ]; then
# No AGENT_TOOLSDIRECTORY on GitHub images
TOOLCACHE_ROOT=$RUNNER_TOOL_CACHE
else
TOOLCACHE_ROOT=$AGENT_TOOLSDIRECTORY
fi

PYTHON_TOOLCACHE_PATH=$TOOLCACHE_ROOT/Python
PYTHON_TOOLCACHE_VERSION_PATH=$PYTHON_TOOLCACHE_PATH/$PYTHON_FULL_VERSION
PYTHON_TOOLCACHE_VERSION_ARCH_PATH=$PYTHON_TOOLCACHE_VERSION_PATH/x64

Expand Down Expand Up @@ -47,4 +54,4 @@ echo "Upgrading PIP..."
./python -m pip install --ignore-installed pip

echo "Create complete file"
touch $PYTHON_TOOLCACHE_VERSION_PATH/x64.complete
touch $PYTHON_TOOLCACHE_VERSION_PATH/x64.complete

0 comments on commit f75c0e6

Please sign in to comment.