From f9d515f141d9e4e421fa13c8d7709f3d94b0fce8 Mon Sep 17 00:00:00 2001
From: Jan <jan@laupetin.net>
Date: Thu, 4 Mar 2021 13:15:57 +0100
Subject: [PATCH] reenable gitlab buildpipeline for gcc linux builds

---
 .disabled-gitlab-ci.yml | 57 -----------------------------------------
 .gitlab-ci.yml          | 33 ++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 57 deletions(-)
 delete mode 100644 .disabled-gitlab-ci.yml
 create mode 100644 .gitlab-ci.yml

diff --git a/.disabled-gitlab-ci.yml b/.disabled-gitlab-ci.yml
deleted file mode 100644
index 3bcfee57..00000000
--- a/.disabled-gitlab-ci.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-stages:
-    - build
-    - test
-
-variables:
-    BUILD_APP: "MSBuild.exe"
-    TEST_APP: "vstest.console.exe"
-        
-.build:
-    stage: build
-    cache:
-      paths:
-        - build/
-    tags:
-      - build
-      - cpp
-      - dotnet
-      - windows
-      - powershell
-    script:
-        - "./generate.bat"
-        - "& \"$BUILD_APP\" build/OpenAssetTools.sln -t:restore -t:build -m -p:Configuration=Release -p:Platform=x86 -p:RestorePackagesPath=build/packages"
-
-build:withartifacts:
-  stage: build
-  extends: .build
-  only:
-    refs:
-      - master
-      - develop
-  artifacts:
-      name: "OpenAssetTools"
-      paths:
-          - build/bin
-
-build:noartifacts:
-  stage: build
-  extends: .build
-  except:
-    refs:
-      - master
-      - develop
-
-
-test:
-    stage: test
-    cache:
-      paths:
-        - build/
-    tags:
-      - test
-      - cpp
-      - dotnet
-      - windows
-      - powershell
-    script:
-        - "& \"$TEST_APP\" --InIsolation build/lib/Release_X86/tests/ZoneCodeGeneratorTests.dll build/lib/Release_X86/tests/ZoneCommonTests.dll"
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 00000000..2064f5a4
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,33 @@
+stages:
+    - build
+    - test
+        
+build-gcc:
+    image: gcc:latest
+    stage: build
+    cache:
+      paths:
+        - build/
+    tags:
+      - build
+      - docker
+      - linux
+    script:
+        - "./generate.sh"
+        - "make -C build -j$(nproc) config=release_x86 all"
+
+test-gcc:
+    stage: test
+    cache:
+      paths:
+        - build/
+    tags:
+      - build
+      - docker
+      - linux
+    script:
+        - "./generate.sh"
+        - "make -C build -j$(nproc) config=release_x86 ObjCommonTests ZoneCodeGeneratorLibTests ZoneCommonTests"
+        - "./build/lib/Release_x86/tests/ObjCommonTests"
+        - "./build/lib/Release_x86/tests/ZoneCodeGeneratorLibTests"
+        - "./build/lib/Release_x86/tests/ZoneCommonTests"