Update config

nzws · Apr 20, 2023 · 764b9ad · 764b9ad
1 parent 65ba8ac
commit 764b9ad
Showing 1 changed file with 13 additions and 46 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -4,6 +4,7 @@ executors:
   arm:
     machine:
       image: ubuntu-2004:current
+      docker_layer_caching: true
     resource_class: arm.medium
 
 orbs:
@@ -24,23 +25,14 @@ jobs:
           paths:
             - .
 
-  lint:
+  server-build-and-publish:
     executor: arm
     steps:
-      - node/install:
-          install-yarn: true
-      - attach_workspace:
-          at: ~/project
-      - run: yarn turbo:lint
-
-  push-test:
-    executor: arm
-    steps:
-      - node/install:
-          install-yarn: true
       - attach_workspace:
           at: ~/project
-      - run: yarn workspace push test
+      - run: docker build -t ghcr.io/nzws/knzklive2-server:$TAG-arm64 -f ./apps/server/Dockerfile .
+      - run: echo $GHCR_TOKEN | docker login ghcr.io -u $GHCR_USER --password-stdin
+      - run: docker push ghcr.io/nzws/knzklive2-server:$TAG-arm64
 
   push-build-and-publish:
     executor: arm
@@ -51,15 +43,6 @@ jobs:
       - run: echo $GHCR_TOKEN | docker login ghcr.io -u $GHCR_USER --password-stdin
       - run: docker push ghcr.io/nzws/knzklive2-push:$TAG-arm64
 
-  video-test:
-    executor: arm
-    steps:
-      - node/install:
-          install-yarn: true
-      - attach_workspace:
-          at: ~/project
-      - run: yarn workspace video test
-
   video-build-and-publish:
     executor: arm
     steps:
@@ -77,31 +60,23 @@ workflows:
             branches:
               only: main
 
-      - lint:
-          requires:
-            - setup
-
-      - push-test:
+      - server-build-and-publish:
+          pre-steps:
+            - run: echo 'export TAG=staging' >> "$BASH_ENV"
           requires:
             - setup
 
       - push-build-and-publish:
           pre-steps:
             - run: echo 'export TAG=staging' >> "$BASH_ENV"
-          requires:
-            - lint
-            - push-test
-
-      - video-test:
           requires:
             - setup
 
       - video-build-and-publish:
           pre-steps:
             - run: echo 'export TAG=staging' >> "$BASH_ENV"
           requires:
-            - lint
-            - video-test
+            - setup
 
   production:
     jobs:
@@ -110,28 +85,20 @@ workflows:
             branches:
               only: production
 
-      - lint:
-          requires:
-            - setup
-
-      - push-test:
+      - server-build-and-publish:
+          pre-steps:
+            - run: echo 'export TAG=latest' >> "$BASH_ENV"
           requires:
             - setup
 
       - push-build-and-publish:
           pre-steps:
             - run: echo 'export TAG=latest' >> "$BASH_ENV"
-          requires:
-            - lint
-            - push-test
-
-      - video-test:
           requires:
             - setup
 
       - video-build-and-publish:
           pre-steps:
             - run: echo 'export TAG=latest' >> "$BASH_ENV"
           requires:
-            - lint
-            - video-test
+            - setup