Skip to content

Commit 6e65f17

Browse files
authored
Make sure generated code is identical between make runs and fix CI failure (#1165)
This fixes cache misses when using ccache and a race condition that was causing intermittent CI failures
1 parent 27bca04 commit 6e65f17

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Make.Microphysics

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ $(objEXETempDir)/AMReX_buildInfo.o: .FORCE
196196
--link_flags "$(LDFLAGS)" --libraries "$(libraries)" \
197197
--MODULES "$(MNAMES)" $(EXTRA_BUILD_INFO) \
198198
--GIT "$(TOP) $(AMREX_HOME) $(MICROPHYSICS_HOME)"
199+
@if [ ! -d $(objEXETempDir) ]; then mkdir -p $(objEXETempDir); fi
199200
$(SILENT) $(CCACHE) $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(CXXEXEFLAGS) AMReX_buildInfo.cpp -o $(objEXETempDir)/AMReX_buildInfo.o
200201
$(SILENT) $(RM) AMReX_buildInfo.cpp
201202

util/build_scripts/write_probin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ def write_probin(probin_template, param_files,
214214

215215
namespaces = {q.namespace for q in params}
216216

217-
for nm in namespaces:
217+
for nm in sorted(namespaces):
218218
params_nm = [q for q in params if q.namespace == nm]
219219

220220
# open namespace

0 commit comments

Comments
 (0)