Eliminate build script usage

NREL · Nov 8, 2021 · b5b188a · b5b188a
1 parent b9726bf
commit b5b188a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -15,17 +15,26 @@ jobs:
             python: xvfb-run python3
             pip_arg: ""
             nosetests_args: --with-coverage --cover-package epregressions  # --cover-html for local html results
-            build_arg: Ubuntu20
+            pyinstall_args: ""
+            pack_tool: tar -zcvf
+            extension: .tar.gz
+            pack_suffix: -C dist runner
           - os: macos-10.15
             python: python3
             pip_arg: ""
             nosetests_args: ""
-            build_arg: Mac
+            pyinstall_args: --noconsole
+            pack_tool: tar -zcvf
+            extension: .tar.gz
+            pack_suffix: -C dist runner
           - os: windows-2019
             python: python
             pip_arg: --user
             nosetests_args: ""
-            build_arg: Windows
+            pyinstall_args: --noconsole
+            pack_tool: 7z.exe a
+            extension: .zip
+            pack_suffix: ./dist/*
 
     runs-on: ${{ matrix.os }}
 
@@ -44,8 +53,14 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: coveralls --service=github
-    - name: Build Package
-      run: ./scripts/build.sh ${{ matrix.build_arg }}
+    - name: Make Deploy Directory
+      run: mkdir deploy
+    - name: Build Installer
+      run: pyinstaller --onefile ${{ matrix.pyinstall_args }} --add-data "epregressions/diffs/math_diff.config:epregressions/diffs" epregressions/runner.py
+    - name: Fixup Installer
+      run: |
+        VERSION_STRING=$(grep VERSION epregressions/__init__.py | cut -d= -f2 | xargs)
+        ${{ matrix.pack_tool }} deploy/EnergyPlusRegressionTool-"${VERSION_STRING}"-${{ matrix.os }}${{ matrix.extension }} ${{ matrix.pack_suffix }}
     - name: Upload Package
       uses: actions/upload-artifact@v2
       with:

diff --git a/scripts/build.sh b/scripts/build.sh
@@ -4,25 +4,20 @@ BUILD_CONFIG=$1
 
 VERSION_STRING=$(grep VERSION epregressions/__init__.py | cut -d= -f2 | xargs)
 
-rm -rf deploy
-
 case ${BUILD_CONFIG} in
 
   Ubuntu20)
     pyinstaller --onefile --add-data "epregressions/diffs/math_diff.config:epregressions/diffs" epregressions/runner.py
-    mkdir deploy
     tar -zcvf deploy/EnergyPlusRegressionTool-"${VERSION_STRING}"-Ubuntu20.04.tar.gz -C dist runner
     ;;
 
   Mac)
     pyinstaller --onefile --noconsole --add-data "epregressions/diffs/math_diff.config:epregressions/diffs" epregressions/runner.py
-    mkdir deploy
     tar -zcvf deploy/EnergyPlusRegressionTool-"${VERSION_STRING}"-Mac.tar.gz -C dist runner.app
     ;;
 
   Windows)
     pyinstaller --onefile --noconsole --add-data "epregressions/diffs/math_diff.config;epregressions/diffs" epregressions/runner.py
-    mkdir deploy
     7z.exe a deploy/EnergyPlusRegressionTool-"${VERSION_STRING}"-Windows.zip ./dist/*
     ;;