Skip to content

Commit

Permalink
Merge branch 'master' into add-sphinx-mermaid
Browse files Browse the repository at this point in the history
  • Loading branch information
jessica-mitchell committed Aug 15, 2023
2 parents 9b5c34d + d3b920d commit 613ff3c
Show file tree
Hide file tree
Showing 9 changed files with 553 additions and 712 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/build_dispatch.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
on: [push]

permissions:
contents: read

jobs:
trigger_externals:
if: ${{ github.repository_owner == 'nest' && github.ref_name == 'master' }}
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ on:
schedule:
- cron: '31 8 * * *'

permissions:
contents: read

jobs:
stale:

Expand Down
4 changes: 1 addition & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@
# You should have received a copy of the GNU General Public License
# along with NEST. If not, see <http://www.gnu.org/licenses/>

# Version range from minimum required (3.12 for macOS OpenMP)
# up to newest version tested, see https://cliutils.gitlab.io/modern-cmake/chapters/basics.html
cmake_minimum_required( VERSION 3.12...3.16 )
cmake_minimum_required( VERSION 3.19 )

# add cmake modules: for all `include(...)` first look here
list( APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake )
Expand Down

0 comments on commit 613ff3c

Please sign in to comment.