✅ Balerion HotFix for Release Build Workflow (#140)

* ✅ Modify Pull Request Workflow for Shorter Build times

- Reduce MacOS and Windows to only run integration tests. 
- Add make file to run all integration tests

* 🐛 Release Build CI Fixes

- Simplify commands for CI
- Add test pypi commands for CI for easy flipping
- Add noshow to stop existing issue
- Add release commands

* 🐛 Add atomic writes for windows

* 🆙 Update Version to v1.1.1

Author: keithrfung

.github/workflows/pull_request.yml

@@ -47,7 +47,7 @@ jobs:
         run: make environment
       - name: Install Module
         run: make install validate
-      - name: Test
+      - name: Full Test & Coverage
         run: make coverage
 
   mac_check:
@@ -66,8 +66,8 @@ jobs:
         run: make environment
       - name: Install Module
         run: make install validate
-      - name: Test
-        run: make coverage
+      - name: Integration Tests
+        run: make test-integration
 
   windows_check:
     name: Windows Check
@@ -87,6 +87,5 @@ jobs:
         run: make environment
       - name: Install Module
         run: make install validate
-      - name: Test
-        continue-on-error: true #TODO Remove Window tests bypass
-        run: make test
+      - name: Integration Tests
+        run: make test-integration

.github/workflows/release.yml

@@ -49,7 +49,7 @@ jobs:
         run: make environment
       - name: Install Module
         run: make install validate
-      - name: Test
+      - name: Full Test & Coverage
         run: make coverage
 
   mac_check:
@@ -68,8 +68,8 @@ jobs:
         run: make environment
       - name: Install Module
         run: make install validate
-      - name: Test
-        run: make coverage
+      - name: Integration Tests
+        run: make test-integration
 
   windows_check:
     name: Windows Check
@@ -89,9 +89,8 @@ jobs:
         run: make environment
       - name: Install Module
         run: make install validate
-      - name: Test
-        continue-on-error: true #TODO Remove Window tests bypass
-        run: make test
+      - name: Integration Tests
+        run: make test-integration
 
   release:
     name: Release
@@ -118,6 +117,13 @@ jobs:
           release_name: Release ${{ env.PACKAGE_VERSION }}
           draft: false
           prerelease: false
+      - name: Dependency Graph
+        run: make dependency-graph-ci
+      - name: Upload Dependency Graph as Artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: dependency-graph
+          path: dependency-graph.svg
       - name: Package
         run: make package
       - name: Upload Package as Artifact
@@ -126,26 +132,14 @@ jobs:
           name: package
           path: dist/
       - name: Upload Package to PyPi
-        run: |
-          python -m pip install --user --upgrade twine
-          python -m twine upload --username __token__ --password ${{ secrets.PYPI_TOKEN }} dist/*
+        env:
+          TEST_PYPI_TOKEN: ${{ secrets.TEST_PYPI_TOKEN }}
+          PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
+        run: make package-upload-ci
       - name: Validate Import
         run: make package-validate
-      - name: Dependency Graph
-        run: | 
-          sudo apt install graphviz
-          pip install pydeps
-          pydeps --max-bacon 2 -o dependency-graph.svg src/electionguard
-      - name: Upload Dependency Graph as Artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: dependency-graph
-          path: dependency-graph.svg
       - name: Zip Artifacts
-        run: |
-          mv dist electionguard
-          mv dependency-graph.svg electionguard
-          zip -r electionguard.zip electionguard
+        run: make release-zip-ci
       - name: Add Artifacts to Release
         id: upload-release-asset_1
         uses: actions/[email protected]
@@ -157,6 +151,4 @@ jobs:
           asset_name: electionguard.zip
           asset_content_type: application/zip
       - name: Deploy Github Pages
-        run: |
-          pip install mkdocs
-          mkdocs gh-deploy --force
+        run: make docs-deploy-ci

Makefile

@@ -89,6 +89,10 @@ test-example:
 	@echo ✅ TEST Example
 	pipenv run python -m pytest -s tests/integration/test_end_to_end_election.py
 
+test-integration:
+	@echo ✅ INTEGRATION TESTS
+	pipenv run pytest tests/integration
+
 # Coverage
 coverage:
 	@echo ✅ COVERAGE
@@ -115,8 +119,18 @@ docs-deploy:
 	@echo 🚀 DEPLOY to Github Pages
 	pipenv run mkdocs gh-deploy --force
 
+docs-deploy-ci:
+	@echo 🚀 DEPLOY to Github Pages
+	pip install mkdocs
+	mkdocs gh-deploy --force
+
 dependency-graph:
-	pipenv run pydeps --max-bacon 2 -o dependency-graph.svg src/electionguard
+	pipenv run pydeps --noshow --max-bacon 2 -o dependency-graph.svg src/electionguard
+
+dependency-graph-ci:
+	sudo apt install graphviz
+	pip install pydeps
+	pydeps --noshow --max-bacon 2 -o dependency-graph.svg src/electionguard
 
 # Sample Data
 generate-sample-data:
@@ -130,20 +144,34 @@ package:
 	python setup.py sdist bdist_wheel
 
 package-upload:
-	python3 -m pip install --user --upgrade twine
+	python -m pip install --user --upgrade twine
 	python -m twine upload dist/*
 
+package-upload-ci:
+	python -m pip install --user --upgrade twine
+	python -m twine upload --username __token__ --password $(PYPI_TOKEN) dist/*
+
 package-upload-test:
-	python3 -m pip install --user --upgrade twine
+	python -m pip install --user --upgrade twine
 	python -m twine upload --repository testpypi dist/*
 
+package-upload-test-ci:
+	python -m pip install --user --upgrade twine
+	python -m twine upload --repository testpypi --username __token__ --password $(TEST_PYPI_TOKEN) dist/*
+
 package-validate:	
 	@echo ✅ VALIDATE
 	python -m pip install --no-deps electionguard
 	python -c 'import electionguard'
 
-
 package-validate-test:	
 	@echo ✅ VALIDATE
 	python -m pip install --index-url https://test.pypi.org/simple/ --no-deps electionguard
 	python -c 'import electionguard'
+
+# Release
+release-zip-ci:
+	@echo 📁 ZIP RELEASE ARTIFACTS
+	mv dist electionguard
+	mv dependency-graph.svg electionguard
+	zip -r electionguard.zip electionguard

Pipfile

@@ -4,6 +4,7 @@ url = "https://pypi.org/simple"
 verify_ssl = true
 
 [dev-packages]
+atomicwrites = "*"
 black = "*"
 coverage = "*"
 docutils = "*"