Skip to content

Commit

Permalink
Remove Decent CI stuff, add develop build, cleanup alternate build
Browse files Browse the repository at this point in the history
  • Loading branch information
Myoldmopar committed Aug 27, 2024
1 parent 9b54c4d commit a1b4641
Show file tree
Hide file tree
Showing 13 changed files with 169 additions and 394 deletions.
34 changes: 0 additions & 34 deletions .decent_ci-Linux.yaml

This file was deleted.

3 changes: 0 additions & 3 deletions .decent_ci-MacOS.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions .decent_ci-Windows.yaml

This file was deleted.

44 changes: 44 additions & 0 deletions .github/workflows/alternate_linux_build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: Alternate Linux Build

on:
push:
branches: [ develop ]
# Sequence of patterns matched against refs/tags
tags:
- 'v*' # Push events matching v*, i.e. v1.0, v20.15.10
pull_request:
branches: [ develop ]

jobs:

alternate_build_configurations:
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@v4

- name: Set FC for Ubuntu 24.04
shell: bash
run: echo "FC=gfortran-13" >> $GITHUB_ENV

- name: Create Build Directory
run: cmake -E make_directory ./build/

- name: Configure CMake
shell: bash
working-directory: ./build/
run: |
cmake -DCMAKE_BUILD_TYPE=Release \
-DLINK_WITH_PYTHON=OFF \
-DUSE_PSYCHROMETRICS_CACHING=OFF \
-DUSE_GLYCOL_CACHING=OFF \
-DOPENGL_REQUIRED=OFF \
-DUSE_PSYCH_STATS=ON \
-DUSE_PSYCH_ERRORS=OFF \
-DENABLE_PCH=OFF \
../
- name: Build EnergyPlus
working-directory: ./build/
shell: bash
run: cmake --build . --target energyplus -j 4
104 changes: 104 additions & 0 deletions .github/workflows/build_and_test_develop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
name: Develop Testing

on:
push:
branches: [ develop ] # run this on all commits to the develop branch

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
FC: gfortran-13
Python_REQUIRED_VERSION: 3.12.3 # 3.12.2 not available on Ubuntu 24 GHA
shell: bash

jobs:
build_and_test:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
include:
- os: macos-12
macos_dev_target: 12.1
arch: x86_64
python-arch: x64
generator: "Unix Makefiles"
nproc: 3
- os: macos-14
macos_dev_target: 13.0
arch: arm64
python-arch: arm64
generator: "Unix Makefiles"
nproc: 3
- os: ubuntu-24.04
arch: x86_64
python-arch: x64
generator: "Unix Makefiles"
nproc: 4
- os: windows-2019
arch: x86_64
python-arch: x64
generator: "Visual Studio 16 2019"
nproc: 4
- os: windows-2022
arch: x86_64
python-arch: x64
generator: "Visual Studio 17 2022"
nproc: 4

steps:

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

- name: Install Dependencies for Mac
if: ${{ runner.os == 'macOS' }}
run: |
brew update
brew install gcc@13
echo "FC=$(brew --prefix gcc@13)/bin/gfortran-13" >> $GITHUB_ENV
echo MACOSX_DEPLOYMENT_TARGET=${{ matrix.macos_dev_target }} >> $GITHUB_ENV
- name: Install Dependencies for Linux
if: ${{ runner.os == 'Linux' }}
run: |
sudo apt-get update
sudo apt-get install libxkbcommon-x11-0 xorg-dev libgl1-mesa-dev
if [[ "${{ matrix.os }}" == "ubuntu-24.04" ]]; then
# https://github.com/actions/runner-images/issues/10025
echo "FC=gfortran-13" >> $GITHUB_ENV
fi
- uses: actions/checkout@v4

- name: Create Build Directory
run: cmake -E make_directory ./build/

- name: Configure CMake
working-directory: ./build
run: >
cmake
-G "${{ matrix.generator }}"
-DCMAKE_BUILD_TYPE:STRING=Release
-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${{ matrix.macos_dev_target }}
-DLINK_WITH_PYTHON:BOOL=ON
-DPython_REQUIRED_VERSION:STRING=${{ steps.setup-python.outputs.python-version }}
-DPython_ROOT_DIR:PATH=$RUNNER_TOOL_CACHE/Python/${{ steps.setup-python.outputs.python-version }}/${{ matrix.python-arch }}/
-DBUILD_TESTING:BOOL=ON
-DBUILD_FORTRAN:BOOL=ON
-DBUILD_PACKAGE:BOOL=OFF
-DDOCUMENTATION_BUILD:STRING=DoNotBuild
-DENABLE_OPENMP:BOOL=OFF
-DUSE_OpenMP:BOOL=OFF
../
- name: Build
id: build
working-directory: ./build
run: cmake --build . -j ${{ matrix.nproc }} --config Release

- name: Test
working-directory: ./build
run: ctest -C Release -E Basement -j 3
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build And Test
name: Pull Request Testing

on:
pull_request:
Expand Down Expand Up @@ -191,5 +191,5 @@ jobs:
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
body: "# :warning: Regressions Detected\n - Build: ${{ matrix.os }}\n - Commit: ${{ github.action_ref }}\n - [View Results](https://github.com/NREL/EnergyPlus/actions/runs/${{ github.run_id }})\n - [Download Regressions](${{ steps.upload_regressions.outputs.artifact-url }})"
body: "### :warning: Regressions detected on ${{ matrix.os }} for commit ${{ github.sha }}\n $GITHUB_STEP_SUMMARY \n\n - [View Results](https://github.com/NREL/EnergyPlus/actions/runs/${{ github.run_id }})\n - [Download Regressions](${{ steps.upload_regressions.outputs.artifact-url }})"
})
84 changes: 0 additions & 84 deletions .github/workflows/linux_build.yml

This file was deleted.

Loading

0 comments on commit a1b4641

Please sign in to comment.