Skip to content
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
25 changes: 11 additions & 14 deletions .github/workflows/buildCSharp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ jobs:
build-csharp:
name: ${{ matrix.name }}
runs-on: ${{ matrix.os }}
if: |
github.event_name == 'push' ||
(github.event_name == 'pull_request' && (github.base_ref == 'master' || github.base_ref == 'CSharp'))
strategy:
# fail-fast: Default is true, switch to false to allow one platform to fail and still run others
fail-fast: false
Expand All @@ -40,7 +37,7 @@ jobs:
os: windows-latest

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7
# # If you need to rebuild for a specific branch or tag **after** you fixed the workflow and you have no other changes or only a few you can download from github
# with:
# ref: v3.8.0
Expand All @@ -58,7 +55,7 @@ jobs:
# git fetch --all
# git reset --soft v3.8.0

- uses: actions/setup-python@v5
- uses: actions/setup-python@v7
with:
python-version: 3.12 # only for conan, version doesn't matter much

Expand Down Expand Up @@ -239,20 +236,20 @@ jobs:
7z a CSharp_${{ matrix.name }}_Src.zip ./build/csharp_wrapper/generated_sources ./build/csharp_wrapper/OpenStudio.csproj

- name: Upload artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: CSharp_${{ matrix.name }}
path: CSharp_${{ matrix.name }}.zip

- name: Upload artifact generated_sources
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: CSharp_${{ matrix.name }}_Src
path: CSharp_${{ matrix.name }}_Src.zip

- name: Upload artifact (if failed)
if: failure()
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: ${{ matrix.name }}_Failed
path: |
Expand All @@ -267,15 +264,15 @@ jobs:
needs: build-csharp

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

- name: Download CSharp_Windows32
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
name: CSharp_Windows32

- name: Download CSharp_Windows64
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
name: CSharp_Windows64

Expand Down Expand Up @@ -319,7 +316,7 @@ jobs:
ls

- name: Upload artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: CSharp_Windows_x64x86
path: x64x86\OpenStudio.nupkg
Expand Down Expand Up @@ -372,10 +369,10 @@ jobs:
needs: build-csharp

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

- name: Download nuget
uses: actions/download-artifact@v4
uses: actions/download-artifact@v8
with:
name: CSharp_${{ matrix.name }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/clangformat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
contents: write # Needed to push a commit

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

- name: Run clang-format against C++ files touched by the PR
if: ${{ github.event_name == 'pull_request' }}
Expand Down Expand Up @@ -44,7 +44,7 @@ jobs:

- name: Upload clang-format patch as artifact
if: ${{ failure() }}
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: OpenStudio-${{ github.sha }}-clang_format.patch
path: clang_format.patch
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cppcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
#container:
# image: nrel/cppcheck:2.3
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7

- name: Install cppcheck
shell: bash
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:

- name: Upload cppcheck results as artifact
if: ${{ always() }}
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: OpenStudio-${{ github.sha }}-cppcheck_results.txt
path: cppcheck.txt
4 changes: 2 additions & 2 deletions .github/workflows/dependabot_conan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ jobs:
pull-requests: write # Create pull request

steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7

- uses: actions/setup-python@v6
- uses: actions/setup-python@v7
with:
python-version: '3.x'

Expand Down
34 changes: 17 additions & 17 deletions .github/workflows/excluded-tests-summary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
has_windows: ${{ steps.matrix.outputs.has_windows }}
steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v7

- name: Install PyYAML
run: pip install pyyaml
Expand Down Expand Up @@ -129,20 +129,20 @@ jobs:
df -h || true

- name: Checkout repository
uses: actions/checkout@v6
uses: actions/checkout@v7
with:
fetch-depth: 1

- name: Restore ccache cache
uses: actions/cache@v4
uses: actions/cache@v6
with:
path: ~/.ccache
key: ccache-${{ matrix.os }}-${{ matrix.platform }}-${{ hashFiles('conan.lock') }}
restore-keys: |
ccache-${{ matrix.os }}-${{ matrix.platform }}-

- name: Restore Conan cache
uses: actions/cache@v4
uses: actions/cache@v6
with:
path: ~/.conan2
key: conan-${{ matrix.os }}-${{ matrix.platform }}-${{ hashFiles('conan.lock') }}
Expand Down Expand Up @@ -171,7 +171,7 @@ jobs:
if [ -d /usr/local/cmake/bin ]; then echo "/usr/local/cmake/bin" >> $GITHUB_PATH; fi

- name: Cache External Dependencies
uses: actions/cache@v4
uses: actions/cache@v6
with:
path: |
${{ env.OPENSTUDIO_BUILD }}/EnergyPlus*.tar.gz
Expand All @@ -184,7 +184,7 @@ jobs:
external-deps-${{ matrix.os }}-

- name: Restore Generated Embedded Files
uses: actions/cache@v4
uses: actions/cache@v6
with:
path: |
${{ env.OPENSTUDIO_BUILD }}/src/*/embedded_files
Expand Down Expand Up @@ -278,7 +278,7 @@ jobs:

- name: Upload Test Summary
if: always() && steps.ctest.outputs.has_tests == 'true'
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: ExcludedTests-${{ matrix.platform }}-${{ github.sha }}
path: |
Expand All @@ -299,7 +299,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v6
uses: actions/checkout@v7
with:
path: ${{ env.OPENSTUDIO_SOURCE }}
fetch-depth: 1
Expand All @@ -315,7 +315,7 @@ jobs:
max-size: ${{ env.CCACHE_MAXSIZE }}

- name: Restore Conan cache
uses: actions/cache@v4
uses: actions/cache@v6
with:
path: ~/.conan2
key: conan-${{ matrix.os }}-${{ matrix.platform }}-${{ hashFiles('conan.lock') }}
Expand Down Expand Up @@ -356,7 +356,7 @@ jobs:
run: cmake -E make_directory ${{ env.OPENSTUDIO_BUILD }}

- name: Cache External Dependencies
uses: actions/cache@v4
uses: actions/cache@v6
with:
path: |
${{ env.OPENSTUDIO_BUILD }}/EnergyPlus*.tar.gz
Expand All @@ -369,7 +369,7 @@ jobs:
external-deps-${{ matrix.os }}-

- name: Restore Generated Embedded Files
uses: actions/cache@v4
uses: actions/cache@v6
with:
path: |
${{ env.OPENSTUDIO_BUILD }}/src/*/embedded_files
Expand Down Expand Up @@ -464,7 +464,7 @@ jobs:

- name: Upload Test Summary
if: always() && steps.ctest.outputs.has_tests == 'true'
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: ExcludedTests-${{ matrix.platform }}-${{ github.sha }}
path: |
Expand All @@ -490,7 +490,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v6
uses: actions/checkout@v7
with:
path: ${{ env.OPENSTUDIO_SOURCE }}
fetch-depth: 1
Expand All @@ -500,7 +500,7 @@ jobs:
run: git config --global --add safe.directory '*'

- name: Restore sccache cache
uses: actions/cache@v4
uses: actions/cache@v6
with:
path: ${{ github.workspace }}\.sccache
key: sccache-${{ matrix.os }}-${{ matrix.platform }}-${{ hashFiles('conan.lock') }}
Expand Down Expand Up @@ -534,15 +534,15 @@ jobs:
uses: Mozilla-Actions/sccache-action@v0.0.5

- name: Restore Conan cache
uses: actions/cache@v4
uses: actions/cache@v6
with:
path: ~/.conan2
key: conan-${{ matrix.os }}-windows-${{ hashFiles('conan.lock') }}
restore-keys: |
conan-${{ matrix.os }}-windows-

- name: Set up Python 3.12.2
uses: actions/setup-python@v6
uses: actions/setup-python@v7
with:
python-version: '3.12.2'
cache: 'pip'
Expand Down Expand Up @@ -646,7 +646,7 @@ jobs:

- name: Upload Test Summary
if: always() && steps.ctest.outputs.has_tests == 'true'
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: ExcludedTests-${{ matrix.platform }}-${{ github.sha }}
path: |
Expand Down
Loading
Loading