From 4dcfe917a40cd4f31146e9cb2466c7f0d3a612a2 Mon Sep 17 00:00:00 2001
From: ewbo4360 <ewbo4360@bht-berlin.de>
Date: Mon, 18 Nov 2024 21:56:42 +0100
Subject: [PATCH] build pipeline stage update
---
.github/workflows/build.yml | 4 ++--
.gitlab-ci.yml | 13 ++++++++++++-
CONCEPT.md | 5 +++--
3 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cb34dd3..d46ccaf 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -40,13 +40,13 @@ jobs:
cc: gcc-14
cxx: g++-14
packages: g++-14
- meson_options:
+ # meson_options:
- compiler: gcc10
os: ubuntu-24.04
cc: gcc-10
cxx: g++-10
packages: g++-10
- meson_options:
+ # meson_options:
- compiler: clang
os: ubuntu-24.04
cc: clang
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0852aa8..6150fd5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,18 @@
-build-job:
+stages:
+ - build
+ - test
+ - deploy
+
+before_script:
+# the 2 following steps make sure that the required building tool (meson) is installed on the runner
+ - apt-get update && apt-get install -y python3-pip ninja-build
+ - pip3 install meson
+
+build-job :
stage: build
script:
- echo "Hello, $GITLAB_USER_LOGIN!"
+ - meson compile -C --verbose
test-job1:
stage: test
diff --git a/CONCEPT.md b/CONCEPT.md
index c7ae1c4..e8555a7 100644
--- a/CONCEPT.md
+++ b/CONCEPT.md
@@ -1,4 +1,5 @@
-Warning : In this file we only express the life cycle and the way of maintaining our app for the DevOps project. To learn about what it actually does please refer to the README.md at the root of this project.
+Warning : In this file we only express the life cycle and the way of maintaining our app for the DevOps project. To learn about what it actually does please refer to the README.md at the root of this project.
+Also for the moment the pipeline runs only as if Linux was the only available target.
# Formal
@@ -16,7 +17,7 @@ The life cycle of this app is handled through many tools and methods that we dev
We want the maintaining of the application to be as easier as possible for both developers, deployers and users. Knowing this we need to apply as much automation as possible in the maintaining process.
- Obviously the developers needs to respect the Contributing guidelines provided by the original authors to make the automation possible and smooth. For example, frequent and light commits are needed in order to make debugging easier and, in turn, also make patching easier.
+ Obviously the developers needs to respect the Contributing guidelines provided by the original authors in doc/developer.rst to make the automation possible and smooth. For example, frequent and light commits are needed in order to make debugging easier and, in turn, also make patching easier.
The project remote repository is hosted on GitLab.com as a public project.
--
GitLab