From e212e6629f98ab4f8360334759abc8da3718759f Mon Sep 17 00:00:00 2001
From: mo khan <mo.khan@gmail.com>
Date: Thu, 25 Jun 2020 10:10:03 -0600
Subject: Collapse default into deb

---
 .gitlab-ci.yml    | 18 ------------------
 .gitlab/build.yml | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d398230..79f1789 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,20 +1,2 @@
-variables:
-  GIT_DEPTH: "1"
-  GIT_STRATEGY: fetch
-
-default:
-  image: debian:stable-slim
-  artifacts:
-    paths:
-      - pkg/
-    expire_in: 1 week
-  script:
-    - bin/omnibus-setup
-    - bin/omnibus-build $OMNIBUS_PROJECT
-  cache:
-    key: ${CI_JOB_NAME}
-    paths:
-      - tmp/omnibus
-
 include:
   - local: .gitlab/build.yml
diff --git a/.gitlab/build.yml b/.gitlab/build.yml
index 7cf0ba8..4ebfdd6 100644
--- a/.gitlab/build.yml
+++ b/.gitlab/build.yml
@@ -1,73 +1,106 @@
+.deb:
+  image: debian:stable-slim
+  stage: build
+  artifacts:
+    paths:
+      - pkg/
+    expire_in: 1 week
+  script:
+    - bin/omnibus-setup
+    - bin/omnibus-build $OMNIBUS_PROJECT
+  cache:
+    key: ${CI_JOB_NAME}
+    paths:
+      - tmp/omnibus
+  variables:
+    GIT_DEPTH: "1"
+    GIT_STRATEGY: fetch
+
 asdf:
+  extends: .deb
   variables:
     OMNIBUS_PROJECT: asdf
 
 ruby-2-7-1:
+  extends: .deb
   variables:
     OMNIBUS_PROJECT: ruby
     RUBY_VERSION: '2.7.1'
 
 ruby-2-7-0:
+  extends: .deb
   variables:
     OMNIBUS_PROJECT: ruby
     RUBY_VERSION: '2.7.0'
 
 ruby-2-6-6:
+  extends: .deb
   variables:
     OMNIBUS_PROJECT: ruby
     RUBY_VERSION: '2.6.6'
 
 ruby-2-6-5:
+  extends: .deb
   variables:
     OMNIBUS_PROJECT: ruby
     RUBY_VERSION: '2.6.5'
 
 ruby-2-6-4:
+  extends: .deb
   variables:
     OMNIBUS_PROJECT: ruby
     RUBY_VERSION: '2.6.4'
 
 ruby-2-6-3:
+  extends: .deb
   variables:
     OMNIBUS_PROJECT: ruby
     RUBY_VERSION: '2.6.3'
 
 ruby-2-6-2:
+  extends: .deb
   variables:
     OMNIBUS_PROJECT: ruby
     RUBY_VERSION: '2.6.2'
 
 ruby-2-6-1:
+  extends: .deb
   variables:
     OMNIBUS_PROJECT: ruby
     RUBY_VERSION: '2.6.1'
 
 ruby-2-6-0:
+  extends: .deb
   variables:
     OMNIBUS_PROJECT: ruby
     RUBY_VERSION: '2.6.0'
 
 ruby-2-5-8:
+  extends: .deb
   variables:
     OMNIBUS_PROJECT: ruby
     RUBY_VERSION: '2.5.8'
 
 ruby-2-4-5:
+  extends: .deb
   variables:
     OMNIBUS_PROJECT: ruby
     RUBY_VERSION: '2.4.5'
 
 ruby-2-4-10:
+  extends: .deb
   variables:
     OMNIBUS_PROJECT: ruby
     RUBY_VERSION: '2.4.10'
 
 mono-6-8-0-123:
+  extends: .deb
   variables:
     OMNIBUS_PROJECT: mono
     MONO_VERSION: '6.8.0.123'
 
 python-3-8-3:
+  extends: .deb
   allow_failure: true
   variables:
     OMNIBUS_PROJECT: python
-- 
cgit v1.2.3