-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge BRIDGE into main in prep for release v17.12.0 (#614)
Merge BRIDGE into main in prep for release v17.12.0
- Loading branch information
Showing
86 changed files
with
7,702 additions
and
1,787 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,42 +1,22 @@ | ||
| version: 2.1 | ||
|
|
||
| # Anchor to prevent forgetting to update a version | ||
| baselibs_version: &baselibs_version v7.7.0 | ||
|
|
||
| orbs: | ||
| circleci-tools: geos-esm/circleci-tools@0.13.0 | ||
| ci: geos-esm/circleci-tools@1 | ||
|
|
||
| workflows: | ||
| build-test: | ||
| jobs: | ||
| - build-GEOSldas: | ||
| - ci/build: | ||
| name: build-GEOSldas-on-<< matrix.compiler >> | ||
| matrix: | ||
| parameters: | ||
| compiler: [gfortran, ifort] | ||
| context: | ||
| - docker-hub-creds | ||
|
|
||
| jobs: | ||
| build-GEOSldas: | ||
| parameters: | ||
| compiler: | ||
| type: string | ||
| executor: | ||
| name: circleci-tools/<< parameters.compiler >> | ||
| resource_class: large | ||
| working_directory: /root/project | ||
| steps: | ||
| - checkout: | ||
| path: GEOSldas | ||
| - circleci-tools/versions: | ||
| compiler: << parameters.compiler >> | ||
| - circleci-tools/mepoclone: | ||
| repo: GEOSldas | ||
| - circleci-tools/checkout_if_exists: | ||
| repo: GEOSldas | ||
| - circleci-tools/cmake: | ||
| repo: GEOSldas | ||
| compiler: << parameters.compiler >> | ||
| - circleci-tools/buildinstall: | ||
| matrix: | ||
| parameters: | ||
| compiler: [ifort, gfortran] | ||
| baselibs_version: *baselibs_version | ||
| repo: GEOSldas | ||
| - circleci-tools/compress_artifacts | ||
| - store_artifacts: | ||
| path: /logfiles | ||
| mepodevelop: false | ||
| persist_workspace: false # Needs to be true to run fv3/gcm experiment, costs extra |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| # Global Editor Config for MAPL | ||
| # | ||
| # This is an ini style configuration. See http://editorconfig.org/ for more information on this file. | ||
| # | ||
| # Top level editor config. | ||
| root = true | ||
|
|
||
| # Always use Unix style new lines with new line ending on every file and trim whitespace | ||
| [*] | ||
| end_of_line = lf | ||
| insert_final_newline = true | ||
| trim_trailing_whitespace = true | ||
|
|
||
| # Python: PEP8 defines 4 spaces for indentation | ||
| [*.py] | ||
| indent_style = space | ||
| indent_size = 4 | ||
|
|
||
| # YAML format, 2 spaces | ||
| [{*.yaml,*.yml}] | ||
| indent_style = space | ||
| indent_size = 2 | ||
|
|
||
| # CMake (from KitWare: https://github.com/Kitware/CMake/blob/master/.editorconfig) | ||
| [{CMakeLists.txt,*.cmake,*.rst}] | ||
| indent_style = space | ||
| indent_size = 2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| name: Enforce PR Labels | ||
|
|
||
| on: | ||
| pull_request: | ||
| types: [opened, labeled, unlabeled, edited, synchronize] | ||
|
|
||
| jobs: | ||
| require-label: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: mheap/github-action-required-labels@v2 | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| with: | ||
| mode: minimum | ||
| count: 1 | ||
| labels: "0 diff,0 diff trivial,Non 0-diff,0 diff structural,0-diff trivial,Not 0-diff,0-diff,automatic,0-diff uncoupled" | ||
| add_comment: true | ||
| blocking-label: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: mheap/github-action-required-labels@v2 | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| with: | ||
| mode: exactly | ||
| count: 0 | ||
| labels: "Contingent - DNA,Needs Lead Approval,Contingent -- Do Not Approve" | ||
| add_comment: true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,143 @@ | ||
| { | ||
| "version": 3, | ||
| "cmakeMinimumRequired": { | ||
| "major": 3, | ||
| "minor": 21, | ||
| "patch": 0 | ||
| }, | ||
| "configurePresets": [ | ||
| { | ||
| "name": "base-configure", | ||
| "hidden": true, | ||
| "displayName": "Base Configure Settings", | ||
| "description": "Sets build and install directories", | ||
| "binaryDir": "${sourceDir}/build-${presetName}", | ||
| "cacheVariables": { | ||
| "BASEDIR": "$env{BASEDIR}", | ||
| "CMAKE_INSTALL_PREFIX": "${sourceDir}/install-${presetName}" | ||
| } | ||
| }, | ||
| { | ||
| "name": "base-gnu", | ||
| "hidden": true, | ||
| "inherits": "base-configure", | ||
| "displayName": "Base GNU Make Config", | ||
| "description": "Sets GNU Make generator", | ||
| "generator": "Unix Makefiles" | ||
| }, | ||
| { | ||
| "name": "base-ninja", | ||
| "hidden": true, | ||
| "inherits": "base-configure", | ||
| "displayName": "Base Ninja Config", | ||
| "description": "Sets Ninja generator", | ||
| "generator": "Ninja" | ||
| }, | ||
| { | ||
| "name": "Release", | ||
| "inherits": "base-gnu", | ||
| "displayName": "Release Configure", | ||
| "description": "Release build using GNU Make generator", | ||
| "cacheVariables": { | ||
| "CMAKE_BUILD_TYPE": "Release" | ||
| } | ||
| }, | ||
| { | ||
| "name": "Debug", | ||
| "inherits": "base-gnu", | ||
| "displayName": "Debug Configure", | ||
| "description": "Debug build using GNU Make generator", | ||
| "cacheVariables": { | ||
| "CMAKE_BUILD_TYPE": "Debug" | ||
| } | ||
| }, | ||
| { | ||
| "name": "Aggressive", | ||
| "inherits": "base-gnu", | ||
| "displayName": "Aggressive Configure", | ||
| "description": "Aggressive build using GNU Make generator", | ||
| "cacheVariables": { | ||
| "CMAKE_BUILD_TYPE": "Aggressive" | ||
| } | ||
| }, | ||
| { | ||
| "name": "Release-Ninja", | ||
| "inherits": "base-ninja", | ||
| "displayName": "Release Ninja Configure", | ||
| "description": "Release build using Ninja generator", | ||
| "cacheVariables": { | ||
| "CMAKE_BUILD_TYPE": "Release" | ||
| } | ||
| }, | ||
| { | ||
| "name": "Debug-Ninja", | ||
| "inherits": "base-ninja", | ||
| "displayName": "Debug Ninja Configure", | ||
| "description": "Debug build using Ninja generator", | ||
| "cacheVariables": { | ||
| "CMAKE_BUILD_TYPE": "Debug" | ||
| } | ||
| }, | ||
| { | ||
| "name": "Aggressive-Ninja", | ||
| "inherits": "base-ninja", | ||
| "displayName": "Aggressive Ninja Configure", | ||
| "description": "Aggressive build using Ninja generator", | ||
| "cacheVariables": { | ||
| "CMAKE_BUILD_TYPE": "Aggressive" | ||
| } | ||
| } | ||
| ], | ||
| "buildPresets": [ | ||
| { | ||
| "name": "base-build", | ||
| "hidden": true, | ||
| "displayName": "Base Build Config", | ||
| "description": "Sets default build options", | ||
| "jobs": 6, | ||
| "targets": ["install"] | ||
| }, | ||
| { | ||
| "name": "Release", | ||
| "configurePreset": "Release", | ||
| "inherits": "base-build", | ||
| "displayName": "Release Build", | ||
| "description": "Release build using GNU Make generator" | ||
| }, | ||
| { | ||
| "name": "Debug", | ||
| "configurePreset": "Debug", | ||
| "inherits": "base-build", | ||
| "displayName": "Debug Build", | ||
| "description": "Debug build using GNU Make generator" | ||
| }, | ||
| { | ||
| "name": "Aggressive", | ||
| "configurePreset": "Aggressive", | ||
| "inherits": "base-build", | ||
| "displayName": "Aggressive Build", | ||
| "description": "Aggressive build using GNU Make generator" | ||
| }, | ||
| { | ||
| "name": "Release-Ninja", | ||
| "configurePreset": "Release-Ninja", | ||
| "inherits": "base-build", | ||
| "displayName": "Release Ninja Build", | ||
| "description": "Release build using Ninja generator" | ||
| }, | ||
| { | ||
| "name": "Debug-Ninja", | ||
| "configurePreset": "Debug-Ninja", | ||
| "inherits": "base-build", | ||
| "displayName": "Debug Ninja Build", | ||
| "description": "Debug build using Ninja generator" | ||
| }, | ||
| { | ||
| "name": "Aggressive-Ninja", | ||
| "configurePreset": "Aggressive-Ninja", | ||
| "inherits": "base-build", | ||
| "displayName": "Aggressive Ninja Build", | ||
| "description": "Aggressive build using Ninja generator" | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.