[Git][reproducible-builds/disorderfs][master] Don't merge the debian branch.

[Chris Lamb]

Chris Lamb pushed to branch master at Reproducible Builds / disorderfs


Commits:
3fa9506b by Chris Lamb at 2020-12-18T17:26:02+00:00
Don't merge the debian branch.

- - - - -


1 changed file:

- .gitlab-ci.yml


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -6,13 +6,12 @@ stages:
   variables:
     DEBIAN_FRONTEND: noninteractive
   script:
-    - git merge debian
     - apt-get -q update
     - mount -o remount,rw /dev
-    - apt-get -q -y install --no-install-recommends aspcud apt-cudf
-    - apt-get -q -y --solver aspcud -o APT::Solver::Strict-Pinning=0
-        -o Debug::pkgProblemResolver=yes build-dep .
+    - apt-get -q -y install --no-install-recommends libfuse-dev pkg-config bc
     - make test || true
+  except:
+    - debian
 
 unstable:
   <<: *test



View it on GitLab: https://salsa.debian.org/reproducible-builds/disorderfs/-/commit/3fa9506bc45b97082d87b67e77b8e77e4b39da1d

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/disorderfs/-/commit/3fa9506bc45b97082d87b67e77b8e77e4b39da1d
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20201218/325db7b6/attachment.htm>