From 78a0b32b9594b87cb8cfd3e5b2c3f6e5266ea6e3 Mon Sep 17 00:00:00 2001
From: dark64 <darem966@gmail.com>
Date: Wed, 12 Jan 2022 14:22:53 +0100
Subject: [PATCH] change python image

---
 .circleci/config.yml   | 150 ++++++++++++++++++-----------------------
 zokrates_js/Dockerfile |   2 +-
 2 files changed, 66 insertions(+), 86 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6f2b9bf8..b0048be1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -110,7 +110,7 @@ jobs:
           command: WITH_LIBSNARK=1 RUSTFLAGS="-D warnings" ./integration_test.sh
   deploy:
     docker:
-      - image: circleci/python:latest-node
+      - image: cimg/python:3.8-node
     steps:
       - checkout
       - setup_remote_docker:
@@ -145,25 +145,6 @@ jobs:
           name: Run tests
           no_output_timeout: "30m"
           command: npm run test
-  zokrates_js_test2:
-    docker:
-      - image: circleci/python:latest-node
-    steps:
-      - checkout
-      - setup_remote_docker:
-          docker_layer_caching: true
-      - run:
-          no_output_timeout: "30m"
-          command: |
-            docker build -t zokrates_js -f zokrates_js/Dockerfile .
-
-            CID=$(docker create zokrates_js)
-
-            docker cp ${CID}:/build zokrates_js/dist
-            docker rm -f ${CID}
-            
-            cd zokrates_js/dist
-            npm publish --dry-run
   cross_build:
     parameters:
       os:
@@ -259,70 +240,69 @@ tag-only: &tag-only
 workflows:
   build-test-and-deploy:
     jobs:
-#      - build
-#      - test
-#      - cpp_format
-#      - wasm_test
-#      - integration_test
+      - build
+      - test
+      - cpp_format
+      - wasm_test
+      - integration_test
       - zokrates_js_build
       - zokrates_js_test
-      - zokrates_js_test2
-#      - cross_build:
-#          <<: *tag-only
-#          pre-steps:
-#            - install_rust
-#            - install_cross
-#          matrix:
-#            alias: cross-build-linux
-#            parameters:
-#              os:
-#                - linux
-#              target:
-#                - aarch64-unknown-linux-gnu
-#                - arm-unknown-linux-gnueabi
-#                - x86_64-unknown-linux-gnu
-#                - x86_64-pc-windows-gnu
-#      - cross_build:
-#          <<: *tag-only
-#          pre-steps:
-#            - install_rust
-#          build-with: cargo
-#          matrix:
-#            alias: cross-build-macos
-#            parameters:
-#              os:
-#                - macos
-#              target:
-#                - x86_64-apple-darwin
-#      - cross_build:
-#         <<: *tag-only
-#         pre-steps:
-#           - install_rust
-#         build-with: SDKROOT=$(xcrun -sdk macosx11.1 --show-sdk-path) MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx11.1 --show-sdk-platform-version) cargo
-#         add-target: true
-#         matrix:
-#           alias: cross-build-apple-silicon
-#           parameters:
-#             os:
-#               - macos
-#             target:
-#               - aarch64-apple-darwin
-#      - publish_artifacts:
-#          <<: *tag-only
-#          requires:
-#            - cross-build-linux
-#            - cross-build-macos
-#            - cross-build-apple-silicon
-#      - deploy:
-#          filters:
-#            branches:
-#              only:
-#                - deploy
-#          requires:
-#            - build
-#            - test
-#            - cpp_format
-#            - wasm_test
-#            - integration_test
-#            - zokrates_js_build
-#            - zokrates_js_test
+      - cross_build:
+          <<: *tag-only
+          pre-steps:
+            - install_rust
+            - install_cross
+          matrix:
+            alias: cross-build-linux
+            parameters:
+              os:
+                - linux
+              target:
+                - aarch64-unknown-linux-gnu
+                - arm-unknown-linux-gnueabi
+                - x86_64-unknown-linux-gnu
+                - x86_64-pc-windows-gnu
+      - cross_build:
+          <<: *tag-only
+          pre-steps:
+            - install_rust
+          build-with: cargo
+          matrix:
+            alias: cross-build-macos
+            parameters:
+              os:
+                - macos
+              target:
+                - x86_64-apple-darwin
+      - cross_build:
+         <<: *tag-only
+         pre-steps:
+           - install_rust
+         build-with: SDKROOT=$(xcrun -sdk macosx11.1 --show-sdk-path) MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx11.1 --show-sdk-platform-version) cargo
+         add-target: true
+         matrix:
+           alias: cross-build-apple-silicon
+           parameters:
+             os:
+               - macos
+             target:
+               - aarch64-apple-darwin
+      - publish_artifacts:
+          <<: *tag-only
+          requires:
+            - cross-build-linux
+            - cross-build-macos
+            - cross-build-apple-silicon
+      - deploy:
+          filters:
+            branches:
+              only:
+                - deploy
+          requires:
+            - build
+            - test
+            - cpp_format
+            - wasm_test
+            - integration_test
+            - zokrates_js_build
+            - zokrates_js_test
diff --git a/zokrates_js/Dockerfile b/zokrates_js/Dockerfile
index 032f1dc8..a40b1276 100644
--- a/zokrates_js/Dockerfile
+++ b/zokrates_js/Dockerfile
@@ -4,5 +4,5 @@ COPY . src
 RUN cd src/zokrates_js && npm run build && rm -rf target/
 
 RUN cd / && mkdir build \
-    && mv src/zokrates_js/* /build \
+    && cp --verbose -rf src/zokrates_js/* /build/ \
     && rm -rf src
\ No newline at end of file