From 8fe2cf15c8320c1b341bb84b7a5767c7b29e1da3 Mon Sep 17 00:00:00 2001
From: Valentin Emiya <23557104+valentin-emiya@users.noreply.github.com>
Date: Thu, 11 Jul 2024 16:49:21 +0200
Subject: [PATCH] update ci.yml

---
 .gitlab-ci.yml | 55 +++++++++++++++++++++++++-------------------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 42b4f0a..659ca4f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,6 +5,18 @@ default:
     paths:                    # https://pip.pypa.io/en/stable/topics/caching/
       - .cache/pip
   before_script:
+
+stages:
+  - test
+# Change pip's cache directory to be inside the project directory since we can
+# only cache local items.
+variables:
+  PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
+
+install_and_test_39:
+  image: python:3.9
+  stage: test
+  script:
     - apt-get update
     - apt-get install -y --no-install-recommends cmake
     - apt-get install -y --no-install-recommends gcc
@@ -34,18 +46,6 @@ default:
     - source venv/bin/activate
     - pip install --upgrade pip
     - pip install matplotlib numpy scipy six coverage pytest pytest-cov
-
-stages:
-  - test
-# Change pip's cache directory to be inside the project directory since we can
-# only cache local items.
-variables:
-  PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
-
-install_and_test_39:
-  image: python:3.9
-  stage: test
-  script:
     - dpkg -L python3-pytest | xargs file | grep executable
     - pip3 install -e . --no-deps
     - python3 -m pytest
@@ -66,7 +66,6 @@ ubuntu:X86_64:
     - conda activate py39
     - pip3 install -e . --no-deps
     - python3 -m pytest
-    # - py.test-3
   artifacts:
     when: always
     untracked: true
@@ -74,20 +73,22 @@ ubuntu:X86_64:
       - build
     expire_in: 8d
 
-# # Tests on i686 ubuntu
-# ubuntu:i686:
-#   image: registry.gitlab.lis-lab.fr:5005/dev/ltfatpy/ubuntu:i686
-#   tags:
-#     - docker
-#   script:
-#     - pip3 install -e . --no-deps
-#     - py.test-3
-#   artifacts:
-#     when: always
-#     untracked: true
-#     paths:
-#       - build
-#     expire_in: 8d
+# Tests on i686 ubuntu
+ubuntu:i686:
+  image: registry.gitlab.lis-lab.fr:5005/dev/ltfatpy/ubuntu:i686
+  tags:
+    - docker
+  script:
+    - conda create -n py39 Python=3.9
+    - conda activate py39
+    - pip3 install -e . --no-deps
+    - python3 -m pytest
+  artifacts:
+    when: always
+    untracked: true
+    paths:
+      - build
+    expire_in: 8d
 
 # doc template
 .doc: &doc
-- 
GitLab