CI: add a build for ARM architecture

Remove some unnecessary tasks and add a build for ARM. Signed-off-by: Claudio André <[email protected]>
openwall · Jan 5, 2024 · 6dbb887 · 6dbb887
1 parent 9daf16b
commit 6dbb887
Showing 1 changed file with 19 additions and 26 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -11,7 +11,6 @@ jobs:
       - run:
           name: Testing JtR
           command: .circleci/circle-ci.sh TEST
-          no_output_timeout: 20m
 
   wine-32bits:
     <<: *common_linux
@@ -57,44 +56,25 @@ jobs:
           OMP_NUM_THREADS: 2
           ENCODING_TEST: "opencl"
 
-  asan:
-    <<: *common_linux
-    docker:
-      - image: ghcr.io/openwall/john-ci:fedora.32
-        environment:
-          OMP_NUM_THREADS: 2
-          ASAN_TEST: "yes"
-          BUILD_OPTS: "--enable-asan --disable-opencl"
-
   test-full:
     <<: *common_linux
     docker:
       - image: ghcr.io/openwall/john-ci:fedora.32
         environment:
-          OMP_NUM_THREADS: 1
+          OMP_NUM_THREADS: 2
           ASAN_TEST: "yes"
           FULL_TEST: "yes"
           BUILD_OPTS: "--enable-asan --disable-openmp --disable-opencl"
 
   fast-formats-omp:
-    <<: *common_linux
-    docker:
-      - image: ghcr.io/openwall/john-ci:fedora.32
-        environment:
-          OMP_NUM_THREADS: 1
-          ASAN_TEST: "yes"
-          FULL_TEST: "yes"
-          BUILD_OPTS: "--enable-asan --enable-openmp-for-fast-formats --disable-opencl"
-
-  non-SIMD:
     <<: *common_linux
     docker:
       - image: ghcr.io/openwall/john-ci:fedora.32
         environment:
           OMP_NUM_THREADS: 2
           ASAN_TEST: "yes"
           FULL_TEST: "yes"
-          BUILD_OPTS: "--enable-asan --disable-simd --disable-opencl"
+          BUILD_OPTS: "--enable-asan --enable-openmp-for-fast-formats --disable-opencl"
 
   fast-formats-omp-x-non-SIMD:
     <<: *common_linux
@@ -106,18 +86,31 @@ jobs:
           FULL_TEST: "yes"
           BUILD_OPTS: "--enable-asan --enable-openmp-for-fast-formats --disable-simd --disable-opencl"
 
+  arm:
+    machine:
+      image: ubuntu-2204:current
+    resource_class: arm.medium
+    steps:
+      - checkout
+      - run:
+          name: Preparing
+          command: sudo apt update && sudo apt install -y libssl-dev zlib1g-dev libgmp-dev libpcap-dev libbz2-dev && uname -a
+      - run:
+          name: Building JtR
+          command: .circleci/circle-ci.sh BUILD
+      - run:
+          name: Testing JtR
+          command: .circleci/circle-ci.sh TEST
+
 workflows:
   version: 2
   build:
     jobs:
-      - asan
+      - arm
       - encoding-cpu
       - wine-64bits
       - no-plugs
 
-      - non-SIMD:
-          requires:
-            - no-plugs
       - encoding-opencl:
           requires:
             - encoding-cpu