Skip to content

Commit

Permalink
Merge pull request #5049 from NREL/CSharp
Browse files Browse the repository at this point in the history
CSharp Fixes for 3.7.0 release
  • Loading branch information
jmarrec authored Nov 20, 2023
2 parents d526979 + 7f2dc97 commit 55040fb
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 16 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/buildCSharp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
os: windows-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
# If you need to rebuild for a specific branch **after** you fixed the workflow...
# with:
# ref: master
Expand Down Expand Up @@ -194,7 +194,7 @@ jobs:
needs: build-csharp

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Download CSharp_Windows32
uses: actions/download-artifact@v3
Expand Down Expand Up @@ -293,7 +293,7 @@ jobs:
needs: build-csharp

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Download nuget
uses: actions/download-artifact@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/clangformat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Run clang-format against C++ files touched by the PR
shell: bash
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dependabot_conan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-python@v3
- uses: actions/setup-python@v4
with:
python-version: '3.x'

Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/python_bindings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@ jobs:
allow_failure: true # Possible this fails, don't care yet

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

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

Expand Down Expand Up @@ -236,7 +236,7 @@ jobs:
tar -cvzf openstudio-${{ matrix.name }}.tar.gz dist/
- name: Upload .whl to artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: openstudio-${{ matrix.name }} # something like openstudio-Windows_py37
path: ./build/Products/python_package/openstudio-${{ matrix.name }}.tar.gz
Expand All @@ -249,7 +249,7 @@ jobs:
steps:

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v3
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -262,7 +262,7 @@ jobs:
mkdir wheels
- name: Download ALL wheels
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
path: ./wheels

Expand Down Expand Up @@ -333,10 +333,10 @@ jobs:
allow_failure: true # Possible this fails, don't care yet

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v3
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}

Expand Down Expand Up @@ -372,7 +372,7 @@ jobs:
steps:

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -383,7 +383,7 @@ jobs:
mkdir wheels
- name: Download ALL wheels
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
path: ./wheels

Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,7 @@ elseif(WIN32)
else()
set(ENERGYPLUS_PATH "EnergyPlus-${ENERGYPLUS_VERSION}-${ENERGYPLUS_BUILD_SHA}-Windows-i386")
set(ENERGYPLUS_ARCH 32)
set(ENERGYPLUS_EXPECTED_HASH TODO_TDB_TODO) # TODO: not posted on the release page yet
set(ENERGYPLUS_EXPECTED_HASH 379929e4c46e3d22d79f37b905e56a0e)
endif()
if(EXISTS "${PROJECT_BINARY_DIR}/${ENERGYPLUS_PATH}.zip")
file(MD5 "${PROJECT_BINARY_DIR}/${ENERGYPLUS_PATH}.zip" ENERGYPLUS_HASH)
Expand Down

0 comments on commit 55040fb

Please sign in to comment.