From 3ec11fa4c709aea7e17365eb3875b64b57e5774a Mon Sep 17 00:00:00 2001
From: Maciej Dudek <mdudek@antmicro.com>
Date: Thu, 9 Jan 2025 22:52:23 +0100
Subject: [PATCH] Pin xcffib to 1.6.2

This commit pins xcffib library to version 1.6.2 as version
1.7.0 caused cffi error.
This commit also improves CI.

Signed-off-by: Maciej Dudek <mdudek@antmicro.com>
---
 .ci.yml               | 75 ++++++++++++++++++++++++++-----------------
 docs/requirements.txt |  1 +
 2 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/.ci.yml b/.ci.yml
index cb86dc6dd..b89e340fc 100644
--- a/.ci.yml
+++ b/.ci.yml
@@ -1,33 +1,50 @@
 stages:
-  - build
+  - verify
+  - pre-build
+  - build-docs
   - deploy
+  - build
+  - test
+  - test-upstream
 
-image: $CI_DOCS_DOCKER_IMAGE
-
-build:
-  stage: build
-  tags: ['ace-x86_64']
-  variables:
-    GIT_SUBMODULE_STRATEGY: normal
-  before_script:
-    - pip3 install -r docs/requirements.txt
-  script:
-    - cd docs
-    - make html latexpdf
-    - cp build/latex/*.pdf build/html/
-    - tar cf ../$CI_DOCS_ARCHIVE -C build/html/ .
-  artifacts:
-    paths:
-      - $CI_DOCS_ARCHIVE
+variables:
+  GIT_SUBMODULE_STRATEGY: none
+  YAML_SOURCE_COMMIT: 12f4e6a83f1f81217662033b279eb457cbf904e5
 
-deploy:
-  variables:
-    GIT_STRATEGY: none
-  dependencies:
-    - build
-  stage: deploy
-  tags: ['docs']
-  script: echo 'Deploying docs'
-  artifacts:
-    paths:
-      - $CI_DOCS_ARCHIVE
+include:
+    - project: 'rowhammer-tester-ci'
+      ref: 12f4e6a83f1f81217662033b279eb457cbf904e5
+      file: '/ci-setup.yaml'
+    - project: 'rowhammer-tester-ci'
+      ref: 12f4e6a83f1f81217662033b279eb457cbf904e5
+      file: '/ci-bitstream-setup.yaml'
+    - project: 'rowhammer-tester-ci'
+      ref: 12f4e6a83f1f81217662033b279eb457cbf904e5
+      file: '/ci-hw-setup.yaml'
+    - project: 'rowhammer-tester-ci'
+      ref: 12f4e6a83f1f81217662033b279eb457cbf904e5
+      file: '/pre-build-lint-and-unit-tests.yaml'
+    - project: 'rowhammer-tester-ci'
+      ref: 12f4e6a83f1f81217662033b279eb457cbf904e5
+      file: '/build-docs.yaml'
+    - project: 'rowhammer-tester-ci'
+      ref: 12f4e6a83f1f81217662033b279eb457cbf904e5
+      file: '/deploy-docs.yaml'
+    - project: 'rowhammer-tester-ci'
+      ref: 12f4e6a83f1f81217662033b279eb457cbf904e5
+      file: '/build-ddr5-tester-linux.yaml'
+    - project: 'rowhammer-tester-ci'
+      ref: 12f4e6a83f1f81217662033b279eb457cbf904e5
+      file: '/build-spds.yaml'
+    - project: 'rowhammer-tester-ci'
+      ref: 12f4e6a83f1f81217662033b279eb457cbf904e5
+      file: '/build-bitstreams.yaml'
+    - project: 'rowhammer-tester-ci'
+      ref: 12f4e6a83f1f81217662033b279eb457cbf904e5
+      file: '/tests-platforms.yaml'
+    - project: 'rowhammer-tester-ci'
+      ref: 12f4e6a83f1f81217662033b279eb457cbf904e5
+      file: '/tests-sim.yaml'
+    - project: 'rowhammer-tester-ci'
+      ref: 12f4e6a83f1f81217662033b279eb457cbf904e5
+      file: '/test-upstream-is-up-to-date.yaml'
diff --git a/docs/requirements.txt b/docs/requirements.txt
index 18c84882b..0f7bd0511 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -2,3 +2,4 @@
 https://github.com/antmicro/antmicro-sphinx-utils/archive/main.zip
 sphinx-inline-tabs
 sphinx-tippy
+xcffib==1.6.2