Merge remote-tracking branch 'origin/pr/19'

* origin/pr/19: .qubesbuilder: replace 'spec' by 'build' Add Qubes Builder v2 integration
QubesOS · Jul 9, 2022 · 3ac552d · 3ac552d
2 parents e8be052 + aa9777f
commit 3ac552d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,7 +1,11 @@
 include:
-  - project: 'QubesOS/qubes-continuous-integration'
-    file: '/r4.1/gitlab-base.yml'
-  - project: 'QubesOS/qubes-continuous-integration'
-    file: '/r4.1/gitlab-vm.yml'
-  - project: 'QubesOS/qubes-continuous-integration'
-    file: '/r4.0/gitlab-vm.yml'
+- file: /r4.0/gitlab-vm.yml
+  project: QubesOS/qubes-continuous-integration
+- file: /r4.1/gitlab-base.yml
+  project: QubesOS/qubes-continuous-integration
+- file: /r4.1/gitlab-vm.yml
+  project: QubesOS/qubes-continuous-integration
+- file: /r4.2/gitlab-base.yml
+  project: QubesOS/qubes-continuous-integration
+- file: /r4.2/gitlab-vm.yml
+  project: QubesOS/qubes-continuous-integration
diff --git a/.qubesbuilder b/.qubesbuilder
@@ -0,0 +1,7 @@
+vm:
+  rpm:
+    build:
+    - rpm_spec/qubes-shutdown-idle.spec
+  deb:
+    build:
+    - debian