Skip to content

Commit 491b280

Browse files
gmao-rreichlegmao-rreichle
authored
Merge develop into BRIDGE in prep for release v1.0.0 (#7)
2 parents 4181551 + 3efea4a commit 491b280

File tree

96 files changed

+22881
-446
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+22881
-446
lines changed

‎.circleci/config.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
version: 2.1
2+
3+
# Anchors in case we need to override the defaults from the orb
4+
#baselibs_version: &baselibs_version v7.17.0
5+
#bcs_version: &bcs_version v11.4.0
6+
7+
orbs:
8+
ci: geos-esm/circleci-tools@2
9+
10+
workflows:
11+
build-test:
12+
jobs:
13+
# Build GEOSldas
14+
- ci/build:
15+
name: build-GEOSldas-on-<< matrix.compiler >>
16+
context:
17+
- docker-hub-creds
18+
matrix:
19+
parameters:
20+
compiler: [ifort, gfortran]
21+
#baselibs_version: *baselibs_version
22+
repo: GEOSldas
23+
checkout_fixture: true
24+
mepodevelop: false
25+
persist_workspace: false # Needs to be true to run fv3/gcm experiment, costs extra

‎.editorconfig‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Global Editor Config for MAPL
2+
#
3+
# This is an ini style configuration. See http://editorconfig.org/ for more information on this file.
4+
#
5+
# Top level editor config.
6+
root = true
7+
8+
# Always use Unix style new lines with new line ending on every file and trim whitespace
9+
[*]
10+
end_of_line = lf
11+
insert_final_newline = true
12+
trim_trailing_whitespace = true
13+
14+
# Python: PEP8 defines 4 spaces for indentation
15+
[*.py]
16+
indent_style = space
17+
indent_size = 4
18+
19+
# YAML format, 2 spaces
20+
[{*.yaml,*.yml}]
21+
indent_style = space
22+
indent_size = 2
23+
24+
# CMake (from KitWare: https://github.com/Kitware/CMake/blob/master/.editorconfig)
25+
[{CMakeLists.txt,*.cmake,*.rst}]
26+
indent_style = space
27+
indent_size = 2
28+
29+
# Markdown
30+
[*.md]
31+
trim_trailing_whitespace = true
32+
indent_style = space

‎.github/CODEOWNERS‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# This is a comment.
2+
# Each line is a file pattern followed by one or more owners.
3+
# Order is important; the last matching pattern takes the most
4+
# precedence.
5+
6+
# LDAS Gatekeepers own all files
7+
* @GEOS-ESM/ldas-gatekeepers
8+
9+
# The LDAS gatekeepers and CMake should know/approve these
10+
/.github/ @GEOS-ESM/cmake-team @GEOS-ESM/ldas-gatekeepers
11+
/.circleci/ @GEOS-ESM/cmake-team @GEOS-ESM/ldas-gatekeepers
12+
/.codebuild/ @GEOS-ESM/cmake-team @GEOS-ESM/ldas-gatekeepers
13+
14+
# The GEOS CMake Team should be notified about changes to the CMakeLists.txt files in this repository
15+
CMakeLists.txt @GEOS-ESM/cmake-team @GEOS-ESM/ldas-gatekeepers
16+
17+
# The GEOS CMake Team should be notified about and approve config changes
18+
/config/ @GEOS-ESM/cmake-team @GEOS-ESM/ldas-gatekeepers

‎.github/PULL_REQUEST_TEMPLATE/auto_pr_to_mapl3.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
## :memo: Automatic PR: `develop` → `release/MAPL-v3`
2+
3+
### Description
4+
5+
<!-- Write your description here -->
6+
7+
## :file_folder: Modified files
8+
<!-- Diff files - START -->
9+
<!-- Diff files - END -->
10+

‎.github/workflows/changelog-enforcer.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: "Enforce Changelog"
2+
on:
3+
pull_request:
4+
types: [opened, synchronize, reopened, ready_for_review, labeled, unlabeled]
5+
6+
jobs:
7+
# Enforces the update of a changelog file on every pull request
8+
changelog:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: dangoslen/changelog-enforcer@v3
12+
with:
13+
changeLogPath: 'CHANGELOG.md'
14+
skipLabels: 'Skip Changelog,0 diff trivial,automatic,dependencies,github_actions'
15+
missingUpdateErrorMessage: >
16+
No update to CHANGELOG.md found! Please add a changelog
17+
entry to it describing your change. Please note that the
18+
keepachangelog (https://keepachangelog.com) format is
19+
used. If your change is very trivial not applicable for a
20+
changelog entry, add a 'Skip Changelog' label to the pull
21+
request to skip the changelog enforcer.
22+

‎.github/workflows/enforce-labels.yml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Enforce PR Labels
2+
3+
on:
4+
pull_request:
5+
types: [opened, labeled, unlabeled, edited, synchronize]
6+
7+
jobs:
8+
require-label:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: mheap/github-action-required-labels@v5
12+
env:
13+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
14+
with:
15+
mode: minimum
16+
count: 1
17+
labels: "0 diff,0 diff trivial,Non 0-diff,0 diff structural,0-diff trivial,Not 0-diff,0-diff,automatic,0-diff uncoupled,github_actions"
18+
add_comment: true
19+
message: "This PR is being prevented from merging because you have not added one of our required labels: {{ provided }}. Please add one so that the PR can be merged."
20+
21+
blocking-label:
22+
runs-on: ubuntu-latest
23+
steps:
24+
- uses: mheap/github-action-required-labels@v5
25+
env:
26+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
27+
with:
28+
mode: exactly
29+
count: 0
30+
labels: "Contingent - DNA,Needs Lead Approval,Contingent -- Do Not Approve"
31+
add_comment: true
32+
message: "This PR is being prevented from merging because you have added one of our blocking labels: {{ provided }}. You'll need to remove it before this PR can be merged."

‎.github/workflows/push-to-develop.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Push to Develop
2+
3+
on:
4+
push:
5+
branches:
6+
- develop
7+
8+
jobs:
9+
pull_request:
10+
name: Create Pull Request
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Checkout repo
14+
uses: actions/checkout@v4
15+
with:
16+
fetch-depth: 0
17+
- name: Run the action
18+
uses: devops-infra/[email protected]
19+
with:
20+
github_token: ${{ secrets.GITHUB_TOKEN }}
21+
source_branch: develop
22+
target_branch: release/MAPL-v3
23+
label: automatic,MAPL3,Skip Changelog
24+
template: .github/PULL_REQUEST_TEMPLATE/auto_pr_to_mapl3.md
25+
get_diff: true
26+
assignee: ${{ github.actor }}
27+
old_string: "<!-- Write your description here -->"
28+
new_string: ${{ github.event.commits[0].message }}
29+
title: Auto PR - develop → MAPL-v3 - ${{ github.event.commits[0].message }}
30+

‎.github/workflows/validate_yaml_files.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
---
2+
3+
# Based on code from https://github.com/marketplace/actions/yaml-lint
4+
5+
name: Yaml Lint
6+
7+
on:
8+
pull_request:
9+
types: [opened, synchronize, reopened, ready_for_review, labeled, unlabeled]
10+
11+
# This validation is equivalent to running on the command line:
12+
# yamllint -d relaxed --no-warnings
13+
# and is controlled by the .yamllint.yml file
14+
jobs:
15+
validate-YAML:
16+
runs-on: ubuntu-latest
17+
steps:
18+
- uses: actions/checkout@v4
19+
- id: yaml-lint
20+
name: yaml-lint
21+
uses: ibiqlik/action-yamllint@v3
22+
with:
23+
no_warnings: true
24+
format: colored
25+
config_file: .yamllint.yml
26+
27+
- uses: actions/upload-artifact@v4
28+
if: always()
29+
with:
30+
name: yamllint-logfile
31+
path: ${{ steps.yaml-lint.outputs.logfile }}

‎.gitignore‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1-
/@GEOSgcm_GridComp
2-
/GEOSgcm_GridComp
3-
/GEOSgcm_GridComp@
1+
*~
2+
*.swp
3+
*.swo
4+
.DS_Store
5+
*#
6+
.#*
7+
**/CVS/

‎.yamllint.yml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
---
2+
3+
extends: default
4+
5+
rules:
6+
braces:
7+
level: warning
8+
max-spaces-inside: 1
9+
brackets:
10+
level: warning
11+
max-spaces-inside: 1
12+
colons:
13+
level: warning
14+
commas:
15+
level: warning
16+
comments: disable
17+
comments-indentation: disable
18+
document-start: disable
19+
empty-lines:
20+
level: warning
21+
hyphens:
22+
level: warning
23+
indentation:
24+
level: warning
25+
indent-sequences: consistent
26+
line-length:
27+
level: warning
28+
allow-non-breakable-inline-mappings: true
29+
truthy: disable

0 commit comments

Comments
 (0)