Skip to content

Commit

Permalink
Don't use git in up (#659)
Browse files Browse the repository at this point in the history
* modify up to not use git

* bump version

* add back git in a comment

* add the alternative in a comment, it might interfere with antikythera and other CI scripts and there is no need to mess with this now
  • Loading branch information
angelhof committed Mar 8, 2023
1 parent 9284d0b commit a5b300c
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
2 changes: 1 addition & 1 deletion compiler/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from util import *

## Global
__version__ = "0.12.1" # FIXME add libdash version
__version__ = "0.12.2" # FIXME add libdash version
GIT_TOP_CMD = [ 'git', 'rev-parse', '--show-toplevel', '--show-superproject-working-tree']
if 'PASH_TOP' in os.environ:
PASH_TOP = os.environ['PASH_TOP']
Expand Down
16 changes: 16 additions & 0 deletions scripts/up.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,25 @@ if [ "$PLATFORM" = "darwin" ]; then
fi

git clone https://github.com/binpash/pash.git
## TODO: Instead of using git, we could download the latest tarball
## though this would need care because `pash` is not a git directory
## then, potentially interfering with the automatic setting of PASH_TOP
## in some of our CI, etc
# ## Download the latest PaSh release tarball to avoid using git
# curl -s https://api.github.com/repos/binpash/pash/releases/latest |
# grep "tarball_url" |
# cut -d : -f 2,3 |
# tr -d \" |
# tr -d , |
# wget -i - -O pash.tar.gz
# ## Find the name of the top directory
# pash_dir_name=`tar -tzf pash.tar.gz | head -1 | cut -f1 -d"/"`
# tar -xzf pash.tar.gz
# mv "$pash_dir_name" pash

if [ $(groups $(whoami) | grep -c "sudo\|root\|admin") -ge 1 ]; then
# only run this if we are in the sudo group (or it's doomed to fail)
bash ./pash/scripts/distro-deps.sh
fi
export PASH_TOP="$PWD/pash"
bash ./pash/scripts/setup-pash.sh

0 comments on commit a5b300c

Please sign in to comment.