diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c8c8e4dcf0a047acc943bfcd02a1707abb854e45..00a0a6df3665fd0be760bb1f867ee9ac55528b80 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -373,8 +373,9 @@ create-update-mr: - CREATE_MR=$(gitlab project-merge-request create --remove-source-branch true --project-id ${CI_PROJECT_ID} --source-branch "${UPDATE_SOURCE_BRANCH}" --target-branch "${UPDATE_TARGET_BRANCH}" --title "Update ${UPDATE_TARGET} to ${UPDATE_VERSION}.") - IID=${CREATE_MR#* } # there seems to be a race condition here: https://gitlab.com/gitlab-org/gitlab/-/issues/353984 - - sleep 20 - - gitlab project-merge-request merge --project-id ${CI_PROJECT_ID} --iid ${IID} --merge-when-pipeline-succeeds true +# disable auto merge for now, need to give the bot maintainer access for that... +# - sleep 20 +# - gitlab project-merge-request merge --project-id ${CI_PROJECT_ID} --iid ${IID} --merge-when-pipeline-succeeds true - echo "Merge request ${IID} was created. Merging it on successful build." diff --git a/supplements/coq-diaframe-simuliris.opam b/supplements/coq-diaframe-simuliris.opam index 32a3b46ed0bf4f9f88abc9e1cff3ab679a6bd41f..59b0537a0c6f2b3a2926097dfaa9f3276b25b73c 100644 --- a/supplements/coq-diaframe-simuliris.opam +++ b/supplements/coq-diaframe-simuliris.opam @@ -13,7 +13,7 @@ depends: [ "coq-simuliris" ] pin-depends: [ - ["coq-simuliris.dev" "git+https://gitlab.mpi-sws.org/iris/simuliris#2f3a127c"] + ["coq-simuliris.dev" "git+https://gitlab.mpi-sws.org/iris/simuliris#d1018586"] ] build: [make "-j%{jobs}%" "diaframe-simuliris"] install: [make "install-diaframe-simuliris"]