haskell/stackage
1
0
Fork 0
mirror of https://github.com/commercialhaskell/stackage.git synced 2026-01-28 15:10:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleaner dir structure

Browse Source
This commit is contained in:
Michael Snoyman 2020-02-09 12:15:01 +00:00
parent 98b227a06f
commit 0fecc4e522
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
automated/build.sh
View File

@ -5,7 +5,7 @@ set -eu +x -o pipefail
ROOT=$(cd $(dirname $0) ; pwd) ROOT=$(cd $(dirname $0) ; pwd)
TARGET=$1 TARGET=$1
source aws.sh source work/aws.sh
# For nightly-YYYY-MM-DD, tag should be nightly # For nightly-YYYY-MM-DD, tag should be nightly
# For lts-X.Y, tag should be ltsX # For lts-X.Y, tag should be ltsX
@ -21,11 +21,11 @@ fi
IMAGE=commercialhaskell/stackage:$TAG IMAGE=commercialhaskell/stackage:$TAG
PANTRY_DIR=$ROOT/stack/pantry PANTRY_DIR=$ROOT/work/stack/pantry
STACK_DIR=$ROOT/stack STACK_DIR=$ROOT/work/stack
DOT_STACKAGE_DIR=$ROOT/dot-stackage DOT_STACKAGE_DIR=$ROOT/work/dot-stackage
# ssh key is used for committing snapshots (and their constraints) to Github # ssh key is used for committing snapshots (and their constraints) to Github
SSH_DIR=$ROOT/ssh SSH_DIR=$ROOT/work/ssh
USERID=$(id -u) USERID=$(id -u)
mkdir -p \ mkdir -p \
@ -35,14 +35,14 @@ mkdir -p \
"$WORKDIR" \ "$WORKDIR" \
"$SSH_DIR" "$SSH_DIR"
GITCONFIG=$ROOT/gitconfig GITCONFIG=$ROOT/work/gitconfig
cat >$GITCONFIG <<EOF cat >$GITCONFIG <<EOF
[user] [user]
email = michael+stackage-build@fpcomplete.com email = michael+stackage-build@fpcomplete.com
name = Stackage Build host name = Stackage Build host
EOF EOF
HACKAGE_CREDS=$ROOT/hackage-creds HACKAGE_CREDS=$ROOT/work/hackage-creds
function require_400_file { function require_400_file {
if [ ! -f "$1" ] if [ ! -f "$1" ]
@ -57,8 +57,8 @@ function require_400_file {
require_400_file "$SSH_DIR/id_rsa" require_400_file "$SSH_DIR/id_rsa"
require_400_file "$HACKAGE_CREDS" require_400_file "$HACKAGE_CREDS"
mkdir -p $ROOT/bin mkdir -p $ROOT/work/bin
BINDIR=$(cd $ROOT/bin ; pwd) BINDIR=$(cd $ROOT/work/bin ; pwd)
( (
cd $BINDIR cd $BINDIR
rm -f curator stack *.bz2 rm -f curator stack *.bz2