Commit 9f7855d4 authored by Eric Timmons's avatar Eric Timmons
Browse files

Fix merging

parent 6f11dd7a

.gitlab-ci.yml

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ include: 
    - mkdir ~/common-lisp

    - git clone https://gitlab.common-lisp.net/asdf/asdf.git ~/common-lisp/asdf

    - git -C ~/common-lisp/asdf checkout -b "add-gfs-for-system-parsing" "origin/add-gfs-for-system-parsing"

    - git config --global user.email "$GITLAB_USER_EMAIL"

    - git config --global user.name "$GITLAB_USER_NAME"

    - git -C ~/common-lisp/asdf merge "origin/iss-72"

    - !reference [.clci clpm install, script]

    - !reference [.clci clpm configure, script]