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

Post 24.1 Cleanups #10458

Merged
merged 24 commits into from
Apr 29, 2024
Merged
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
3b46b63
Add package testing scripts to repo, start adding them to GH workflow
Myoldmopar Apr 2, 2024
70667a1
Simple line to skip setting up CTest dashboard test targets
Myoldmopar Apr 2, 2024
c062f1a
Fix custom check (license text)
Myoldmopar Apr 2, 2024
8fb8324
Turn off lots of CI stuff to free up test builds for 24.1 cleanup
Myoldmopar Apr 2, 2024
1ff2c68
Add deploy to test pypi for wheel build
Myoldmopar Apr 2, 2024
329edd5
Add dependency for the test job
Myoldmopar Apr 2, 2024
64c3cf4
Only attempt to build wheel on linux
Myoldmopar Apr 2, 2024
08e9b37
Add some extra debugging output
Myoldmopar Apr 2, 2024
664f134
Bump pypi upload to see if it helps wheel posts
Myoldmopar Apr 2, 2024
ef7014d
Bump version ID so it will upload to pypi
Myoldmopar Apr 2, 2024
bf92f1b
Tweak the path to the package test runner script
Myoldmopar Apr 2, 2024
aa598ed
Add tmate to investigate
Myoldmopar Apr 2, 2024
d14a548
Add a bit of debugging prints to the test scripts
Myoldmopar Apr 2, 2024
71f8b78
Comment out tmate for a minute
Myoldmopar Apr 2, 2024
040ee1d
Allow relative path, and also try to extract the artifact
Myoldmopar Apr 3, 2024
0e6c542
Cleaning up testing codebase, still more to do
Myoldmopar Apr 3, 2024
a6fc335
Handle MSVC versions better
Myoldmopar Apr 3, 2024
0b206e0
Update Linux release action
Myoldmopar Apr 24, 2024
424652a
Merge remote-tracking branch 'origin/develop' into Post241QuickChanges
Myoldmopar Apr 24, 2024
f32d814
Try explicitly adding to PYTHONPATH so Python will find modules
Myoldmopar Apr 24, 2024
95e8e61
Merge remote-tracking branch 'origin/develop' into Post241QuickChanges
Myoldmopar Apr 24, 2024
fa47f2f
Actually handle missing config file now
Myoldmopar Apr 24, 2024
4d54404
Add Mac installer testing
Myoldmopar Apr 24, 2024
b3543b1
Re-enable tests that had been disabled
Myoldmopar Apr 24, 2024
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
Prev Previous commit
Next Next commit
Update Linux release action
  • Loading branch information
Myoldmopar committed Apr 24, 2024
commit 0b206e078736751c2697447c38e1cc8c514fae10
Original file line number Diff line number Diff line change
@@ -11,19 +11,16 @@ env:
Python_REQUIRED_VERSION: 3.8

jobs:
linux_release:
build_installer_artifact:
name: Build Installer and Upload # keeping upload in this job so we could potentially download problematic builds
runs-on: ${{ matrix.os }}
continue-on-error: ${{ matrix.allow_failure }}
continue-on-error: false
strategy:
# fail-fast: Default is true, switch to false to allow one platform to fail and still run others
fail-fast: false
matrix:
os: [ubuntu-20.04, ubuntu-22.04]
include:
- os: ubuntu-20.04
allow_failure: false
- os: ubuntu-22.04
allow_failure: false

permissions:
# Needed permission to upload the release asset
contents: write
@@ -58,6 +55,8 @@ jobs:
- name: Create Build Directory
run: cmake -E make_directory ./build/

# should we pin to a specific version of CMake here like we did on Windows?

- name: Configure CMake
working-directory: ./build
shell: bash
@@ -74,6 +73,15 @@ jobs:
shell: bash
run: cmake --build . --target package -j 4

- name: Upload Tarball as artifact for testing
uses: actions/upload-artifact@v4
with:
name: energyplus-${{ matrix.os }}
path: build/EnergyPlus-*-x86_64.tar.gz
if-no-files-found: error
retention-days: 7
overwrite: false

Copy link
Member Author

Choose a reason for hiding this comment

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

On all three platforms, I now upload the tarball/zip as an artifact in the first job, and then test the artifact in a fresh container in a second job.

- name: Upload Tarball to release
uses: svenstaro/upload-release-action@v2
with:
@@ -101,3 +109,54 @@ jobs:
overwrite: true
file_glob: true
asset_name: ${{ matrix.os }}_LinuxShellInstaller


test_package:
name: Test Built Package
needs: build_installer_artifact
runs-on: ${{ matrix.os }}
strategy:
# fail-fast: Default is true, switch to false to allow one platform to fail and still run others
fail-fast: false
matrix:
name: [20, 22]
include:
- name: 20
os: ubuntu-20.04
test_key: ubuntu2004
- name: 22
os: ubuntu-22.04
test_key: ubuntu2204

steps:
- uses: actions/checkout@v3 # Still need E+ checked out to get testing scripts
with:
path: checkout

- name: Set up Python ${{ env.Python_REQUIRED_VERSION }}
uses: actions/setup-python@v4
id: setup-python
with:
python-version: ${{ env.Python_REQUIRED_VERSION }}
architecture: ${{ matrix.arch }}

- name: Gather Test Package from Artifacts
uses: actions/download-artifact@v4
with:
name: energyplus-${{ matrix.os }}
path: package

- name: Check Contents
shell: bash
run: ls

- name: Check Package contents
shell: bash
working-directory: package
run: ls

# - name: Setup tmate session
# uses: mxschmitt/action-tmate@v3

- name: Run Package Tests
run: python checkout/scripts/package_tests/runner.py --verbose ${{ matrix.test_key }} package/
4 changes: 0 additions & 4 deletions .github/workflows/windows_release.yml
Original file line number Diff line number Diff line change
@@ -176,10 +176,6 @@ jobs:
needs: build_installer_artifact
runs-on: windows-2019

permissions:
# Needed permission to upload the release asset
contents: write

steps:
- uses: actions/checkout@v3 # Still need E+ checked out to get testing scripts
with:
115 changes: 0 additions & 115 deletions scripts/package_tests/ep_testing/config.py

This file was deleted.

112 changes: 0 additions & 112 deletions scripts/package_tests/ep_testing/tester.py

This file was deleted.

Loading
Loading