From 1c1b554bc924b66d0e4c08e9abeeda75d3e41f0e Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 19 Oct 2023 18:29:49 +0000
Subject: [PATCH] Update .gitlab-ci.yml file
Drop job temp template, set defaults
---
.gitlab-ci.yml | 44 ++++++++++++++++++--------------------------
1 file changed, 18 insertions(+), 26 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 72f2468989..b292bfc06c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,16 +1,9 @@
-default:
- image: debian:stable-slim
-
-stages: # List of stages for jobs, and their order of execution
- - build
-
variables:
GIT_STRATEGY: clone
GIT_CLONE_PATH: $CI_BUILDS_DIR/$CI_CONCURRENT_ID/$CI_PROJECT_PATH
-.job_template: &job_build # This job runs in the build stage, which runs first.
-
- stage: build
+default:
+ image: debian:stable-slim
cache:
- key: ccache-$CI_PROJECT_PATH_SLUG-$CI_JOB_NAME_SLUG
@@ -137,6 +130,12 @@ variables:
# ccache_reset
echo -e "\e[0Ksection_end:`date +%s`:ccache_reset\r\e[0K"
+ artifacts:
+ paths:
+ - "bin/"
+ - "src/comptime.h"
+ name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-$CI_JOB_NAME_SLUG"
+
after_script:
- - |
# apt_clean
@@ -155,16 +154,16 @@ variables:
# ccahe_stats
echo -e "\e[0Ksection_end:`date +%s`:ccache_stats\r\e[0K"
+stages:
+ - build
+
Debian testing GCC:
- <<: *job_build
+ stage: build
image: debian:testing-slim
allow_failure: true
artifacts:
- paths:
- - "bin/"
- - "src/comptime.h"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-testing-gcc"
variables:
@@ -197,7 +196,7 @@ Debian testing GCC:
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
Windows x86:
- <<: *job_build
+ stage: build
artifacts:
paths:
@@ -227,7 +226,7 @@ Windows x86:
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
Debian stable:amd64:
- <<: *job_build
+ stage: build
artifacts:
paths:
@@ -269,7 +268,7 @@ Debian stable:amd64:
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
Debian stable:i386:
- <<: *job_build
+ stage: build
artifacts:
paths:
@@ -278,7 +277,6 @@ Debian stable:i386:
expose_as: "Debian i386"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-i686"
-
variables:
CC: i686-linux-gnu-gcc
OBJCOPY: i686-linux-gnu-objcopy
@@ -311,7 +309,7 @@ Debian stable:i386:
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
Debian stable:arm64:
- <<: *job_build
+ stage: build
artifacts:
paths:
@@ -353,7 +351,7 @@ Debian stable:arm64:
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
Windows x64:
- <<: *job_build
+ stage: build
artifacts:
paths:
@@ -383,14 +381,11 @@ Windows x64:
echo -e "\e[0Ksection_end:`date +%s`:make\r\e[0K"
Debian stable Clang:
- <<: *job_build
+ stage: build
allow_failure: true
artifacts:
- paths:
- - "bin/"
- - "src/comptime.h"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-clang"
variables:
@@ -430,9 +425,6 @@ Debian testing Clang:
image: debian:testing-slim
artifacts:
- paths:
- - "bin/"
- - "src/comptime.h"
name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-testing-clang"
variables:
--
GitLab