Skip to content

Commit 0871148

Browse files
committed
Fix path issue, just trying on Mac14/U24
1 parent 0bff02c commit 0871148

File tree

2 files changed

+22
-21
lines changed

2 files changed

+22
-21
lines changed

.github/workflows/build_and_test.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
include:
20-
- os: macos-12
21-
macos_dev_target: 12.1
22-
arch: x86_64
23-
python-arch: x64
24-
generator: "Unix Makefiles"
25-
nproc: 3
26-
targets: energyplus ExpandObjects ReadVarsESO Slab Basement AppGPostProcess ParametricPreprocessor
20+
# - os: macos-12
21+
# macos_dev_target: 12.1
22+
# arch: x86_64
23+
# python-arch: x64
24+
# generator: "Unix Makefiles"
25+
# nproc: 3
26+
# targets: energyplus ExpandObjects ReadVarsESO Slab Basement AppGPostProcess ParametricPreprocessor
2727
- os: macos-14
2828
macos_dev_target: 13.0
2929
arch: arm64
@@ -37,18 +37,18 @@ jobs:
3737
generator: "Unix Makefiles"
3838
nproc: 4
3939
targets: energyplus ExpandObjects ReadVarsESO Slab Basement AppGPostProcess ParametricPreprocessor
40-
- os: windows-2019
41-
arch: x86_64
42-
python-arch: x64
43-
generator: "Visual Studio 16 2019"
44-
nproc: 4
45-
targets: energyplus ExpandObjects_build ReadVars_build Slab_build Basement_build AppGPostProcess_build ParametricPreprocessor_build
46-
- os: windows-2022
47-
arch: x86_64
48-
python-arch: x64
49-
generator: "Visual Studio 17 2022"
50-
nproc: 4
51-
targets: energyplus ExpandObjects_build ReadVars_build Slab_build Basement_build AppGPostProcess_build ParametricPreprocessor_build
40+
# - os: windows-2019
41+
# arch: x86_64
42+
# python-arch: x64
43+
# generator: "Visual Studio 16 2019"
44+
# nproc: 4
45+
# targets: energyplus ExpandObjects_build ReadVars_build Slab_build Basement_build AppGPostProcess_build ParametricPreprocessor_build
46+
# - os: windows-2022
47+
# arch: x86_64
48+
# python-arch: x64
49+
# generator: "Visual Studio 17 2022"
50+
# nproc: 4
51+
# targets: energyplus ExpandObjects_build ReadVars_build Slab_build Basement_build AppGPostProcess_build ParametricPreprocessor_build
5252

5353
steps:
5454

@@ -158,14 +158,14 @@ jobs:
158158
- name: Run Regressions
159159
if: always() && steps.branch_build.outcome != 'failure' # always run this step as long as we actually built
160160
id: regressions
161-
run: python ./branch/scripts/dev/gha_regressions.py ./baseline/build/testfiles ./branch/build/testfiles/ ./branch/build/regressions
161+
run: python ./branch/scripts/dev/gha_regressions.py ./baseline/build/testfiles ./branch/build/testfiles/ ${{ github.workspace }}/regressions
162162

163163
- uses: actions/upload-artifact@v4
164164
id: upload_regressions
165165
if: always() && steps.regressions.outcome == 'failure' # only run this if regressions were encountered "failed"
166166
with:
167167
name: "regressions-${{ matrix.os }}"
168-
path: "${{ github.workspace }}/build/regressions"
168+
path: "${{ github.workspace }}/regressions"
169169

170170
- uses: actions/github-script@v7
171171
if: always() && steps.regressions.outcome == 'failure'

scripts/dev/gha_regressions.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,7 @@ def check_all_regressions(self, base_testfiles: Path, mod_testfiles: Path, bundl
297297
any_diffs = False
298298
root_index_files_no_diff = []
299299
root_index_files_diffs = []
300+
bundle_root.mkdir(exist_ok=True)
300301
for baseline in base_testfiles.iterdir():
301302
if not baseline.is_dir():
302303
continue

0 commit comments

Comments
 (0)