git.iko.soy/stackage
on master help sign in
Fix legacy conversion script
303b1c0Michael Snoyman
automated/build.sh+5−13
compare with master
unifiedsplit
@@ -82,7 +82,7 @@ ARGS_PREBUILD="$ARGS_COMMON -u $USERID -e HOME=$HOME -v $DOT_STACKAGE_DIR:$HOME/
82ARGS_BUILD="$ARGS_COMMON"
82ARGS_BUILD="$ARGS_COMMON"
83# instance-data is an undocumented feature of S3 used by amazonka,
83# instance-data is an undocumented feature of S3 used by amazonka,
84# see https://github.com/brendanhay/amazonka/issues/271
84# see https://github.com/brendanhay/amazonka/issues/271
85−ARGS_UPLOAD="$ARGS_COMMON -u $USERID -e HOME=$HOME -v $HACKAGE_CREDS:/hackage-creds:ro -v $DOT_STACKAGE_DIR:$HOME/.stackage -v $SSH_DIR:$HOME/.ssh:ro -v $GITCONFIG:$HOME/.gitconfig:ro -e AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID -e AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY"
85+ARGS_UPLOAD="$ARGS_COMMON -u $USERID -e HOME=$HOME -v $HACKAGE_CREDS:/hackage-creds:ro -v $DOT_STACKAGE_DIR:$HOME/.stackage -v $SSH_DIR:$HOME/.ssh:ro -v $GITCONFIG:$HOME/.gitconfig:ro -e AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID -e AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY -v $DOT_STACKAGE_DIR:/dot-stackage"
86
86
87# Make sure we actually need this snapshot. We only check this for LTS releases
87# Make sure we actually need this snapshot. We only check this for LTS releases
88# since, for nightlies, we'd like to run builds even if they are unnecessary to
88# since, for nightlies, we'd like to run builds even if they are unnecessary to
@@ -143,15 +143,14 @@ docker run $ARGS_UPLOAD $IMAGE /bin/bash -c "curator upload-docs --target $TARGE
143# For some reason, registering on Hackage fails with inscrutable error messages. Disabling.
143# For some reason, registering on Hackage fails with inscrutable error messages. Disabling.
144# docker run $ARGS_UPLOAD $IMAGE /bin/bash -c "exec curator hackage-distro --target $TARGET"
144# docker run $ARGS_UPLOAD $IMAGE /bin/bash -c "exec curator hackage-distro --target $TARGET"
145
145
146−docker run $ARGS_UPLOAD $IMAGE curator legacy-bulk --stackage-snapshots dot-stackage/curator/stackage-snapshots/ --lts-haskell dot-stackage/curator/lts-haskell/ --stackage-nightly dot-stackage/curator/stackage-nightly/
146+docker run $ARGS_UPLOAD $IMAGE curator legacy-bulk --stackage-snapshots /dot-stackage/curator/stackage-snapshots/ --lts-haskell /dot-stackage/curator/lts-haskell/ --stackage-nightly /dot-stackage/curator/stackage-nightly/
147
147
148(
148(
149−
150if [ $SHORTNAME = "lts" ]
149if [ $SHORTNAME = "lts" ]
151then
150then
152− cd dot-stackage/curator/lts-haskell
151+ cd $DOT_STACKAGE_DIR/curator/lts-haskell
153else
152else
154− cd dot-stackage/curator/stackage-nightly
153+ cd $DOT_STACKAGE_DIR/curator/stackage-nightly
155fi
154fi
156
155
157git add *.yaml
156git add *.yaml
@@ -159,14 +158,7 @@ git diff-index --quiet HEAD && echo No changes && exit 0
159git config user.name "Stackage build server"
158git config user.name "Stackage build server"
160git config user.email "michael@snoyman.com"
159git config user.email "michael@snoyman.com"
161git commit -a -m "More conversions $(date)"
160git commit -a -m "More conversions $(date)"
162−
163−if [ $SHORTNAME = "lts" ]
164−then
165− GIT_SSH_COMMAND="ssh -i $ROOT/ssh-lts/id_rsa" git push origin master
166−else
167− GIT_SSH_COMMAND="ssh -i $ROOT/ssh-nightly/id_rsa" git push origin master
161+GIT_SSH_COMMAND="ssh -i $SSH_DIR/id_rsa" git push origin master
168−fi
169−
170)
162)
171
163
172echo -n "Completed at "
164echo -n "Completed at "