Skip to content

Commit

Permalink
Merge pull request #178 from LBNL-ETA/VacuumDec2023
Browse files Browse the repository at this point in the history
Vacuum dec2023
  • Loading branch information
vidanovic authored Jun 27, 2024
2 parents 3929d68 + eec2a34 commit 8fced2f
Show file tree
Hide file tree
Showing 166 changed files with 6,991 additions and 2,895 deletions.
14 changes: 5 additions & 9 deletions .github/workflows/Latest_Ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,18 @@ env:

jobs:
build:
# The CMake configure and build commands are platform agnostic and should work equally
# well on Windows or Mac. You can convert this to a matrix build if you need
# cross-platform coverage.
# See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- name: Install dependencies
run: sudo apt-get update && sudo apt-get install -y g++-11

- name: Configure CMake
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_CXX_STANDARD=17

- name: Build
# Build your program with the given configuration
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}

- name: Test Fenestration Common
Expand Down Expand Up @@ -52,4 +48,4 @@ jobs:

- name: Test Multi Layer Optics
working-directory: ${{github.workspace}}/build
run: src/MultiLayerOptics/MultiLayerOptics_tests
run: src/MultiLayerOptics/MultiLayerOptics_tests
8 changes: 4 additions & 4 deletions .github/workflows/mac_release.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: MacOS 11.0
name: macOS 12.0

on: [push, pull_request]

Expand All @@ -12,15 +12,15 @@ jobs:
# well on Windows or Mac. You can convert this to a matrix build if you need
# cross-platform coverage.
# See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
runs-on: macos-11.0
runs-on: macos-12

steps:
- uses: actions/checkout@v2

- name: Configure CMake
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_CXX_STANDARD=17

- name: Build
# Build your program with the given configuration
Expand Down Expand Up @@ -52,4 +52,4 @@ jobs:

- name: Test Multi Layer Optics
working-directory: ${{github.workspace}}/build
run: src/MultiLayerOptics/MultiLayerOptics_tests
run: src/MultiLayerOptics/MultiLayerOptics_tests
Loading

0 comments on commit 8fced2f

Please sign in to comment.