From f7019e80af3549fb38a5f661534b851a7bf9404f Mon Sep 17 00:00:00 2001
From: Markus Meissner <coder@safemailbox.de>
Date: Mon, 19 Jun 2023 15:54:07 +0200
Subject: [PATCH] [oem] reactivate ci for x230/t430

---
 .gitlab-ci.yml | 108 ++++++++++++++++++++++++-------------------------
 1 file changed, 54 insertions(+), 54 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 930d75d9c..082e06215 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,7 +30,7 @@ build-nitropad-nv4x:
   stage: build
   script: 
     - make BOARD=nitropad-nv41 || true
-    - rm -rf build/x86/openssl
+    - rm -rf build/x86/openssl-*
     - make BOARD=nitropad-nv41
     - ./create-npf.sh nitropad-nv41
     - mkdir -p artifacts
@@ -53,7 +53,7 @@ build-nitropad-ns5x:
   stage: build
   script: 
     - make BOARD=nitropad-ns50 || true
-    - rm -rf build/x86/openssl
+    - rm -rf build/x86/openssl-*
     - make BOARD=nitropad-ns50
     - ./create-npf.sh nitropad-ns50
     - mkdir -p artifacts
@@ -67,55 +67,55 @@ build-nitropad-ns5x:
     expire_in: 30 hrs
 
 
-#build-heads-x230:
-#  image: registry.git.nitrokey.com/nitrokey/heads/heads-build:latest
-#  rules:
-#    - if: '$CI_PIPELINE_SOURCE == "push"'
-#    - if: '$CI_PIPELINE_SOURCE == "schedule"'
-#  tags:
-#    - docker
-#  stage: build
-#  script: 
-#    - make BOARD=x230-hotp-verification
-#    - ./create-npf.sh x230-hotp-verification
-#    - blobs/xx30/download_clean_me.sh
-#    - make BOARD=x230-hotp-maximized
-#    - ./create-npf.sh x230-hotp-maximized
-#    - mkdir -p artifacts
-#    - find /builds/ -name "*.rom"
-#    - find /builds/ -name "*.npf"
-#    - find /builds/ -name "heads*.rom" -exec cp "{}"  artifacts/ \;
-#    - find /builds/ -name "*.npf" -exec cp "{}"  artifacts/ \;
-#  after_script:
-#    - wget $icon_server/checkmark/$CI_COMMIT_REF_NAME/$CI_COMMIT_SHA/$CI_JOB_NAME/$CI_JOB_STATUS/${CI_JOB_URL#*/*/*/}
-#  artifacts:
-#    paths:
-#      - artifacts
-#    expire_in: 30 hrs
-#
-#build-heads-t430:
-#  image: registry.git.nitrokey.com/nitrokey/heads/heads-build:latest
-#  rules:
-#    - if: '$CI_PIPELINE_SOURCE == "push"'
-#    - if: '$CI_PIPELINE_SOURCE == "schedule"'
-#  tags:
-#    - docker
-#  stage: build
-#  script: 
-#    - make BOARD=t430-hotp-verification
-#    - ./create-npf.sh t430-hotp-verification
-#    - blobs/xx30/download_clean_me.sh
-#    - make BOARD=t430-hotp-maximized
-#    - ./create-npf.sh t430-hotp-maximized
-#    - mkdir -p artifacts
-#    - ls /builds/
-#    - find /builds/ -name "*.rom"
-#    - find /builds/ -name "*.npf"
-#    - find /builds/ -name "heads*.rom" -exec cp "{}"  artifacts/ \;
-#    - find /builds/ -name "*.npf" -exec cp "{}"  artifacts/ \;
-#  after_script:
-#    - wget $icon_server/checkmark/$CI_COMMIT_REF_NAME/$CI_COMMIT_SHA/$CI_JOB_NAME/$CI_JOB_STATUS/${CI_JOB_URL#*/*/*/}
-#  artifacts:
-#    paths:
-#      - artifacts
-#    expire_in: 30 hrs
+build-heads-x230:
+  image: registry.git.nitrokey.com/nitrokey/heads/heads-build:latest
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "push"'
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
+  tags:
+    - docker
+  stage: build
+  script: 
+    - make BOARD=x230-hotp-legacy
+    - ./create-npf.sh x230-hotp-legacy
+    - blobs/xx30/download_clean_me.sh
+    - make BOARD=x230-hotp-maximized
+    - ./create-npf.sh x230-hotp-maximized
+    - mkdir -p artifacts
+    - find /builds/ -name "*.rom"
+    - find /builds/ -name "*.npf"
+    - find /builds/ -name "heads*.rom" -exec cp "{}"  artifacts/ \;
+    - find /builds/ -name "*.npf" -exec cp "{}"  artifacts/ \;
+  after_script:
+    - wget $icon_server/checkmark/$CI_COMMIT_REF_NAME/$CI_COMMIT_SHA/$CI_JOB_NAME/$CI_JOB_STATUS/${CI_JOB_URL#*/*/*/}
+  artifacts:
+    paths:
+      - artifacts
+    expire_in: 30 hrs
+
+build-heads-t430:
+  image: registry.git.nitrokey.com/nitrokey/heads/heads-build:latest
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "push"'
+    - if: '$CI_PIPELINE_SOURCE == "schedule"'
+  tags:
+    - docker
+  stage: build
+  script: 
+    - make BOARD=t430-hotp-legacy
+    - ./create-npf.sh t430-hotp-legacy
+    - blobs/xx30/download_clean_me.sh
+    - make BOARD=t430-hotp-maximized
+    - ./create-npf.sh t430-hotp-maximized
+    - mkdir -p artifacts
+    - ls /builds/
+    - find /builds/ -name "*.rom"
+    - find /builds/ -name "*.npf"
+    - find /builds/ -name "heads*.rom" -exec cp "{}"  artifacts/ \;
+    - find /builds/ -name "*.npf" -exec cp "{}"  artifacts/ \;
+  after_script:
+    - wget $icon_server/checkmark/$CI_COMMIT_REF_NAME/$CI_COMMIT_SHA/$CI_JOB_NAME/$CI_JOB_STATUS/${CI_JOB_URL#*/*/*/}
+  artifacts:
+    paths:
+      - artifacts
+    expire_in: 30 hrs