Merge branch 'balay/fix-ci-linux-intel/maint' into 'maint'

ci: fix diff for linux-intel on gce desktops

See merge request petsc/petsc!2788

ci: fix diff for linux-intel on gce desktops

Merge branch 'maint'

Merge branch 'jolivet/fix-typos' into 'maint'

Typos

See merge request petsc/petsc!2711

Typos

Merge branch 'knepley/feature-dm-addboundary-collective' into 'master'

Knepley/feature dm addboundary collective

See merge request petsc/petsc!2659

DM: Change examples to use DMAddBoundary() instead of PetscDSAddBoundary()
- Now you have to call DMCopyDS() after labels have been established on the coarse DM
- Also, p4est setup has to have happen

DM: Change examples to use DMAddBoundary() instead of PetscDSAddBoundary()
- Now you have to call DMCopyDS() after labels have been established on the coarse DM
- Also, p4est setup has to have happened before label completion

show more ...

Merge branch 'jed/promote-examples-tests-tutorials' [petsc/petsc!2610]

* jed/promote-examples-tests-tutorials:
Promote examples/{tests,tutorials}/ to {tests,tutorials}/

Promote examples/{tests,tutorials}/ to {tests,tutorials}/

This shortens paths and improves consistency between test target names
and paths to the source and output files. Most of the work was
compl

Promote examples/{tests,tutorials}/ to {tests,tutorials}/

This shortens paths and improves consistency between test target names
and paths to the source and output files. Most of the work was
completed by this script, followed by mild cleanup of nonconforming
cases.

for makefile in `git ls-files 'src/*makefile'`; do
if rg -q 'DIRS.*\bexamples\b' $makefile; then
base=$(dirname $makefile)
dirs=$(cd $base/examples && ls -d tests tutorials 2>/dev/null | xargs echo)
perl -pi -e "s#^(DIRS.*)\bexamples\b#\1${dirs}#" $makefile
git rm $base/examples/makefile
for t in $dirs; do
git mv $base/examples/$t $base/
perl -pi -e "s#^(LOCDIR[[:space:]]*=).*#\1 $base/$t/#" $base/$t
done
fi
done

git grep -l -E -z 'examples/(tutorials|tests)' | xargs -0 perl -pi -e 's#examples/(tutorials|tests)#\1#g'
git checkout @ \
src/docs/website/documentation/changes/ \
src/benchmarks/results/

show more ...