From 37e122197f6b86d58b4daffe8bddded97d753a73 Mon Sep 17 00:00:00 2001
From: Byron Lathi <bslathi19@gmail.com>
Date: Sat, 5 Mar 2022 19:22:00 -0600
Subject: [PATCH] Refactor CI into one file

Remove the downstream stuff and consolidate the hw and sw pipelines into
one.
---
 .gitlab-ci.yml         | 23 +++++++++++++++++------
 hw/fpga/.gitlab-ci.yml | 11 -----------
 sw/.gitlab-ci.yml      | 12 ------------
 3 files changed, 17 insertions(+), 29 deletions(-)
 delete mode 100644 hw/fpga/.gitlab-ci.yml
 delete mode 100644 sw/.gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 555dd36..64ea4f8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,18 @@
-sw:
-  trigger:
-    include: sw/.gitlab-ci.yml
+default:
+  tags:
+    - docker
 
-fpga:
-  trigger:
-    include: hw/fpga/.gitlab-ci.yml
+build-sw:
+  stage: build
+  image: bslathi19/cc65
+  script:
+    - cd sw/
+    - make
+
+
+build-fpga:
+  stage: build
+  image: bslathi19/modelsim_18.1:lite
+  script:
+    - cd hw/fpga/
+    - quartus_map super6502 -c super6502
diff --git a/hw/fpga/.gitlab-ci.yml b/hw/fpga/.gitlab-ci.yml
deleted file mode 100644
index b028401..0000000
--- a/hw/fpga/.gitlab-ci.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-default:
-  image: bslathi19/modelsim_18.1:lite
-  tags:
-    - docker
-
-build1:
-  stage: build
-  script:
-    - cd hw/fpga/
-    - quartus_map super6502 -c super6502
-
diff --git a/sw/.gitlab-ci.yml b/sw/.gitlab-ci.yml
deleted file mode 100644
index 5663d22..0000000
--- a/sw/.gitlab-ci.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-default:
-  image: bslathi19/cc65
-  tags:
-    - docker-gcc
-
-build-job:
-  stage: build
-  script:
-    - cd sw/
-    - make
-
-