Test merge_sbi.

.gitlab-ci.yml

@@ -27,24 +27,10 @@ variables:
 
 ## Build jobs
 
-build-coq.8.11.0:
+build-iris.dev:
   <<: *template
   variables:
-    OPAM_PINS: "coq version 8.11.0"
+    OPAM_PINS: "coq version 8.11.0   coq-iris.dev git git+https://gitlab.mpi-sws.org/iris/iris.git#ci/robbert/merge_sbi"
   tags:
   - fp-timing
 
-build-coq.8.10.2:
-  <<: *template
-  variables:
-    OPAM_PINS: "coq version 8.10.2"
-
-build-iris.dev:
-  <<: *template
-  variables:
-    OPAM_PINS: "coq version dev   coq-stdpp.dev git git+https://gitlab.mpi-sws.org/iris/stdpp.git#$STDPP_REV   coq-iris.dev git git+https://gitlab.mpi-sws.org/iris/iris.git#$IRIS_REV   coq-orc11.dev git git+https://gitlab.mpi-sws.org/iris/orc11.git#$ORC11_REV   coq-gpfsl.dev git git+https://gitlab.mpi-sws.org/iris/gpfsl.git#$GPFSL_REV"
-  except:
-  only:
-  - triggers
-  - schedules
-  - api

theories/lifetime/frac_borrow.v

@@ -126,7 +126,7 @@ Section frac_bor.
     destruct (Qp_lower_bound (qκ'/2) (qφ0/2)) as (qq & qκ'0 & qφ0' & Hqκ' & Hqφ).
     iExists qq.
     iAssert (▷ φ qq ∗ ⎡▷ φ' (qφ0' + qφ0 / 2) V0⎤)%Qp%I with "[Hφ0]" as "[$ Hqφ]".
-    { rewrite -{1}(Qp_div_2 qφ0) {1}Hqφ -assoc_L embed_later -bi.later_sep. iNext.
+    { rewrite -{1}(Qp_div_2 qφ0) {1}Hqφ -assoc_L !embed_later -bi.later_sep. iNext.
       iDestruct ("Hfrac" with "Hφ0") as "[Hφ0 $]". iApply "Hφ'".
       by iApply (monPred_in_elim with "HV0"). }
     iAssert (▷ ⎡own γ qq⎤ ∗