Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Eliminate build script #82

Merged
merged 4 commits into from
Nov 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 23 additions & 5 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,29 @@ 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: ""
add_data: "epregressions/diffs/math_diff.config:epregressions/diffs"
pack_tool: tar -zcvf
extension: .tar.gz
pack_suffix: -C dist runner
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pulled some new args into the workflow matrix. I wish I could collapse them down a little, but I think this is fine. I don't anticipate it getting much bigger.

- os: macos-10.15
python: python3
pip_arg: ""
nosetests_args: ""
build_arg: Mac
pyinstall_args: --noconsole
add_data: "epregressions/diffs/math_diff.config:epregressions/diffs"
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
add_data: "epregressions/diffs/math_diff.config;epregressions/diffs"
pack_tool: 7z.exe a
extension: .zip
pack_suffix: ./dist/*

runs-on: ${{ matrix.os }}

Expand All @@ -44,8 +56,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 "${{ matrix.add_data }}" 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 }}
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This section replaces the build script. Same commands executed, just keeping it right in the CI workflow file.

- name: Upload Package
uses: actions/upload-artifact@v2
with:
Expand Down
33 changes: 0 additions & 33 deletions scripts/build.sh

This file was deleted.