@@ -21,7 +21,6 @@ IMAGE=snoyberg/stackage:$TAG
22PLAN_FILE=current-plan.yaml
22PLAN_FILE=current-plan.yaml
23DOCMAP_FILE=current-docmap.yaml
23DOCMAP_FILE=current-docmap.yaml
24−BUNDLE_FILE=current.bundle
26CABAL_DIR=$ROOT/cabal
25CABAL_DIR=$ROOT/cabal
27STACK_DIR=$ROOT/stack
26STACK_DIR=$ROOT/stack
@@ -127,7 +126,7 @@ esac
127# Now do the actual build. We need to first set the owner of the home directory
126# Now do the actual build. We need to first set the owner of the home directory
128# correctly, so we run the command as root, change owner, and then use sudo to
127# correctly, so we run the command as root, change owner, and then use sudo to
129# switch back to the current user
128# switch back to the current user
130−docker run $ARGS_BUILD $IMAGE nice -n 15 /bin/bash -c "chown $USER $HOME && exec sudo -E -u $USER env \"HOME=$HOME\" \"PATH=\$PATH\" stackage-curator make-bundle --jobs $JOBS --plan-file $PLAN_FILE --docmap-file $DOCMAP_FILE --bundle-file $BUNDLE_FILE --target $TARGET"
129+docker run $ARGS_BUILD $IMAGE nice -n 15 /bin/bash -c "chown $USER $HOME && exec sudo -E -u $USER env \"HOME=$HOME\" \"PATH=\$PATH\" stackage-curator make-bundle --jobs $JOBS --plan-file $PLAN_FILE --docmap-file $DOCMAP_FILE --target $TARGET"
132# Make sure we actually need this snapshot. We used to perform this check
131# Make sure we actually need this snapshot. We used to perform this check
133# exclusively before building. Now we perform it after as well for the case of
132# exclusively before building. Now we perform it after as well for the case of
@@ -142,7 +141,7 @@ docker run $ARGS_UPLOAD $IMAGE /bin/bash -c "exec stackage-curator check-target-
142# * Upload the 00-index.tar file to S3 (TODO: this is probably no longer necessary, since snapshots never modify .cabal files)
141# * Upload the 00-index.tar file to S3 (TODO: this is probably no longer necessary, since snapshots never modify .cabal files)
143# * Upload the new plan .yaml file to the appropriate Github repo
142# * Upload the new plan .yaml file to the appropriate Github repo
144# * Register as a new Hackage distro
143# * Register as a new Hackage distro
145−docker run $ARGS_UPLOAD $IMAGE /bin/bash -c "stackage-curator upload-docs --target $TARGET --bundle-file $BUNDLE_FILE && stackage-curator upload-index --plan-file $PLAN_FILE --target $TARGET && stackage-curator upload-github --plan-file $PLAN_FILE --docmap-file $DOCMAP_FILE --target $TARGET && exec stackage-curator hackage-distro --plan-file $PLAN_FILE --target $TARGET"
144+docker run $ARGS_UPLOAD $IMAGE /bin/bash -c "stackage-curator upload-docs --target $TARGET && stackage-curator upload-index --plan-file $PLAN_FILE --target $TARGET && stackage-curator upload-github --plan-file $PLAN_FILE --docmap-file $DOCMAP_FILE --target $TARGET && exec stackage-curator hackage-distro --plan-file $PLAN_FILE --target $TARGET"
147echo -n "Completed at "
146echo -n "Completed at "