From 7069414173bcb5f2e1995a030ff9e4264b4e6bda Mon Sep 17 00:00:00 2001 From: eliahrebstock <eliah_rebstock@ultimatesoftware.com> Date: Fri, 25 Jan 2019 13:54:14 +0100 Subject: [PATCH] Add CI for 32bits and 64bits compilation --- .gitlab-ci.yml | 11 +++++++++-- Makefile | 5 ----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9a647a5..1bb2c22 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,9 +6,16 @@ before_script: - apt-get install libx11-dev:i386 libc6-dev-i386 build-essential -y - apt-get install libx11-dev libc6-dev build-essential -y -smoke-test-by-make: +make-32bit: stage: build script: - - make + - ARCH_OPT='-m32' make + tags: + - docker + +make-64bit: + stage: build + script: + - ARCH_OPT='-m64' make tags: - docker diff --git a/Makefile b/Makefile index 0962f1e..334a912 100644 --- a/Makefile +++ b/Makefile @@ -21,11 +21,6 @@ # along with this program; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -## Define this option to specify architecture -## Can be -m32 for 32 bit application or -## -m64 for 64 bit application. -ARCH_OPT = - CD = cd LOGINC = include -- GitLab