From 3143066477c79de91e1faf647102f40120393810 Mon Sep 17 00:00:00 2001
From: Matthieu <matthieu@developershouse.xyz>
Date: Wed, 13 Oct 2021 17:31:11 +0400
Subject: [PATCH] fix circleci

---
 .circleci/config.yml | 66 ++++++++++++++++++++++++++++++++------------
 1 file changed, 49 insertions(+), 17 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5e9dd7e..dcdd118 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -21,10 +21,16 @@ commands:
       #- run:
       #    name: Docker login
       #    command: echo "$GHCR_PASS" | docker login ghcr.io -u "$GHCR_USER" --password-stdin
-  build-and-test:
-    description: |
-      Builds and test
+jobs:
+  build-linux-arm64:
+    machine:
+      image: ubuntu-2004:202101-01
+    resource_class: arm.medium
     steps:
+      - setup-ci
+      - restore_cache:
+          keys:
+            - bazel-cache-linux-arm-{{ .Branch }}
       - run:
           name: "Test"
           command: "bazelisk test //:tests || true"
@@ -44,18 +50,6 @@ commands:
             mv ~/project/bazel-bin/packages* ~/project/artifacts
       - store_artifacts:
           path: ~/project/artifacts
-
-jobs:
-  build-linux-arm64:
-    machine:
-      image: ubuntu-2004:202101-01
-    resource_class: arm.medium
-    steps:
-      - setup-ci
-      - restore_cache:
-          keys:
-            - bazel-cache-linux-arm-{{ .Branch }}
-      - build-and-test
       # - run:
       #     name: Publish docker images
       #     command: |
@@ -70,7 +64,25 @@ jobs:
           paths:
             - ~/.cache/bazel
           key: bazel-cache-linux-x86-{{ .Branch }}
-      - build-and-test
+      - run:
+          name: "Test"
+          command: "bazelisk test //:tests || true"
+
+      - store_test_results:
+          path: ~/project/bazel-testlogs/rest
+      - store_test_results:
+          path: ~/project/bazel-testlogs/webhook
+
+      - run:
+          name: "Build"
+          command: "bazelisk build //:packages"
+      - run:
+          name: "Move artifacts"
+          command: |
+            mkdir ~/project/artifacts
+            mv ~/project/bazel-bin/packages* ~/project/artifacts
+      - store_artifacts:
+          path: ~/project/artifacts
       # - run:
       #     name: Publish docker images
       #     command: |
@@ -87,7 +99,27 @@ jobs:
       - restore_cache:
           keys:
             - bazel-cache-windows-{{ .Branch }}
-      - build-and-test
+      - run:
+          name: "Test"
+          command: |
+            $ErrorActionPreference = ‘SilentlyContinue’
+            bazelisk test //:tests
+
+      - store_test_results:
+          path: ~/project/bazel-testlogs/rest
+      - store_test_results:
+          path: ~/project/bazel-testlogs/webhook
+
+      - run:
+          name: "Build"
+          command: "bazelisk build //:packages"
+      - run:
+          name: "Move artifacts"
+          command: |
+            mkdir ~/project/artifacts
+            mv ~/project/bazel-bin/packages* ~/project/artifacts
+      - store_artifacts:
+          path: ~/project/artifacts
 
   build-macos:
     macos:
-- 
2.39.5