Merge branch '30-circleci-project-setup'

Change CI to CircleCI Add Windows build Fixes Nitrokey#30 Fixes Nitrokey#31
sgued · Jul 24, 2020 · d3759a6 · d3759a6
2 parents dc6bb28 + 139896f
commit d3759a6
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 13 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -0,0 +1,26 @@
+version: 2.1
+
+orbs:
+  win: circleci/[email protected]
+  python: circleci/[email protected]
+
+jobs:
+  build-msi-win:
+    executor: win/default
+    steps:
+      - checkout
+      - run: pip install -r ci-requirements.txt
+      - run: python win_setup.py bdist_msi
+
+  build-linux:
+    executor: python/default
+    steps:
+      - checkout
+      - run: make init
+      - run: make CI
+
+workflows:
+  main:
+    jobs:
+      - build-msi-win
+      - build-linux
diff --git a/.travis.yml b/.travis.yml
diff --git a/ci-requirements.txt b/ci-requirements.txt
@@ -0,0 +1,12 @@
+cx-Freeze==6.1
+click>=7.0
+cryptography
+ecdsa
+fido2==0.7.3
+intelhex
+pyserial
+pyusb
+requests
+pygments
+cffi
+
diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -6,3 +6,4 @@ flake8
 flit
 ipython
 isort
+