- revert changes

raft-tech · Aug 30, 2024 · 0b656e1 · 0b656e1
1 parent 0da2af1
commit 0b656e1
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 43 deletions.
diff --git a/.circleci/build-and-test/workflows.yml b/.circleci/build-and-test/workflows.yml
@@ -3,15 +3,15 @@
     when: << pipeline.parameters.build_and_test_all >>
     jobs:
       - secrets-check
-      # - test-backend:
-      #     requires:
-      #       - secrets-check
-      # - test-frontend:
-      #     requires:
-      #       - secrets-check
-      # - test-e2e:
-      #     requires:
-      #       - secrets-check
+      - test-backend:
+          requires:
+            - secrets-check
+      - test-frontend:
+          requires:
+            - secrets-check
+      - test-e2e:
+          requires:
+            - secrets-check
 
   ci-build-and-test-all:
     jobs:
@@ -22,46 +22,46 @@
                 - main
                 - master
                 - /^release.*/
-      # - test-backend:
-      #     filters:
-      #       branches:
-      #         only:
-      #           - main
-      #           - master
-      #           - /^release.*/
-      #     requires:
-      #       - secrets-check
-      # - test-frontend:
-      #     filters:
-      #       branches:
-      #         only:
-      #           - main
-      #           - master
-      #           - /^release.*/
-      #     requires:
-      #       - secrets-check
-      # - test-e2e:
-      #     filters:
-      #       branches:
-      #         only:
-      #           - main
-      #           - master
-      #           - /^release.*/
-      #     requires:
-      #       - secrets-check
+      - test-backend:
+          filters:
+            branches:
+              only:
+                - main
+                - master
+                - /^release.*/
+          requires:
+            - secrets-check
+      - test-frontend:
+          filters:
+            branches:
+              only:
+                - main
+                - master
+                - /^release.*/
+          requires:
+            - secrets-check
+      - test-e2e:
+          filters:
+            branches:
+              only:
+                - main
+                - master
+                - /^release.*/
+          requires:
+            - secrets-check
 
   build-and-test-backend:
     when: << pipeline.parameters.build_and_test_backend >>
     jobs:
       - secrets-check
-      # - test-backend:
-      #     requires:
-      #       - secrets-check
+      - test-backend:
+          requires:
+            - secrets-check
 
   build-and-test-frontend:
     when: << pipeline.parameters.build_and_test_frontend >>
     jobs:
       - secrets-check
-      # - test-frontend:
-      #     requires:
-      #       - secrets-check
+      - test-frontend:
+          requires:
+            - secrets-check
diff --git a/tdrs-backend/Dockerfile b/tdrs-backend/Dockerfile
@@ -22,7 +22,7 @@ apt -y update && apt install postgresql-client-15 -y
 # Install packages:
 RUN apt install -y gcc graphviz graphviz-dev libpq-dev python3-dev vim
 # Install pipenv
-RUN pip install --upgrade pip pipenv setuptools
+RUN pip install --upgrade pip pipenv
 RUN pipenv install --dev --system --deploy
 
 # Adds our application code to the image