Merge branch 'dev' into bump-testing-requirements

* dev: `build-linux` -> `build-linux-amd64` Revert build.spec imports are to folders, not files test manual forced import of datas json file try PyInstaller==4.8 adds tests to linux arm64 so that everything breaks now remember to add all the hashes 🙃 updates naming for arm64 add arm build to ci update pyinstaller to 4.7
mxito3 · Feb 2, 2022 · 231e423 · 231e423
2 parents 90a5360 + d4f3773
commit 231e423
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 3 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -102,7 +102,7 @@ jobs:
       - run:
           name: Run deposit script on Windows"
           command: python ./test_deposit_script.py
-  build-linux:
+  build-linux-amd64:
     machine:
       image: ubuntu-1604:202007-01
     working_directory: ~/repo
@@ -147,6 +147,51 @@ jobs:
             sha256sum ${BUILD_FILE_NAME}.tar.gz | head -c 64 > /tmp/artifacts/${BUILD_FILE_NAME}.sha256
       - store_artifacts:
           path: /tmp/artifacts
+  build-linux-arm64:
+    machine:
+      image: ubuntu-2004:202101-01
+    resource_class: arm.medium
+    working_directory: ~/repo
+    steps:
+      - checkout
+      - run:
+          name: Install building requirements on Linux ARM64
+          command: |
+            env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install 3.7.5;
+            pyenv global 3.7.5;
+            pip install -r ./build_configs/linux/requirements.txt;
+      - run:
+          name: Build with build.spec
+          command: |
+            export PYTHONHASHSEED=42
+            export CIRCLE_SHORT_SHA1=$(eval echo $CIRCLE_SHA1 | cut -c -7)
+            export BUILD_FILE_NAME=staking_deposit-cli-${CIRCLE_SHORT_SHA1}-linux-arm64;
+            mkdir ${BUILD_FILE_NAME};
+            pyenv global 3.7.5;
+            pyinstaller --distpath ./${BUILD_FILE_NAME} ./build_configs/linux/build.spec;
+      - run:
+          name: Test executable binaries
+          command: |
+            export PYTHONHASHSEED=42
+            export CIRCLE_SHORT_SHA1=$(eval echo $CIRCLE_SHA1 | cut -c -7)
+            export BUILD_FILE_NAME=staking_deposit-cli-${CIRCLE_SHORT_SHA1}-linux-arm64;
+            export TEST_FOLDER_NAME=TMP_TEST_FOLDER
+            mkdir ${TEST_FOLDER_NAME}
+            cp -r ${BUILD_FILE_NAME} ${TEST_FOLDER_NAME}
+            cp test_binary_script.py ${TEST_FOLDER_NAME}
+            cd ${TEST_FOLDER_NAME}
+            python test_binary_script.py ./${BUILD_FILE_NAME};
+      - run:
+          name: Compress the file
+          command: |
+            export CIRCLE_SHORT_SHA1=$(eval echo $CIRCLE_SHA1 | cut -c -7)
+            export BUILD_FILE_NAME=staking_deposit-cli-${CIRCLE_SHORT_SHA1}-linux-arm64;
+            tar -zcvf ${BUILD_FILE_NAME}.tar.gz ./${BUILD_FILE_NAME};
+            mkdir /tmp/artifacts;
+            cp ${BUILD_FILE_NAME}.tar.gz /tmp/artifacts;
+            sha256sum ${BUILD_FILE_NAME}.tar.gz | head -c 64 > /tmp/artifacts/${BUILD_FILE_NAME}.sha256
+      - store_artifacts:
+          path: /tmp/artifacts
   build-windows:
     executor:
       name: win/default
@@ -254,7 +299,8 @@ workflows:
       - win-py37-script
   build_linux:
     jobs:
-      - build-linux
+      - build-linux-amd64
+      - build-linux-arm64
   build_windows:
     jobs:
         - build-windows

diff --git a/build_configs/linux/build.spec b/build_configs/linux/build.spec
@@ -7,7 +7,7 @@ a = Analysis(['../../staking_deposit/deposit.py'],
              binaries=[],
              datas=[
                  ('../../staking_deposit/key_handling/key_derivation/word_lists/*.txt', './staking_deposit/key_handling/key_derivation/word_lists/'),
-                 ('../../staking_deposit/intl', './staking_deposit/intl',)
+                 ('../../staking_deposit/intl', './staking_deposit/intl'),
              ],
              hiddenimports=[],
              hookspath=[],