Commit b473d7bb authored by zauberstuhl's avatar zauberstuhl

Fix ganggo image on custom builds

* merge needs -m flag otherwise it tries to open an editor
* use checkout instead of stash to reset HEAD
parent 14dbfbc5
Pipeline #752 failed with stage
in 19 minutes and 45 seconds
......@@ -21,6 +21,9 @@ WORKDIR $GOPATH/src/git.feneas.org/ganggo/ganggo
RUN make install
RUN make precompile
RUN git config --global user.email "you@example.com"
RUN git config --global user.name "Your Name"
COPY start.sh /start.sh
COPY app.conf $GOPATH/src/git.feneas.org/ganggo/ganggo/conf/app.conf
......
......@@ -14,10 +14,10 @@ if [ "$PROJECT" == "ganggo" ]; then
https://git.feneas.org/ganggo/federation.git $repo
fi
cd $repo && git stash \
cd $repo && git checkout . \
&& git remote add custom $PRREPO \
&& git fetch custom \
&& git merge $PRSHA \
&& git merge -m merge $PRSHA \
&& git log -1 || {
echo "Cannot find $PRREPO $PRSHA"
exit 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment