Skip to content

Commit

Permalink
Merge BRIDGE into main in prep for release v1.0.0 (#8)
Browse files Browse the repository at this point in the history
  • Loading branch information
gmao-rreichle authored Mar 26, 2024
2 parents 90ba7d3 + 491b280 commit a740464
Show file tree
Hide file tree
Showing 86 changed files with 22,086 additions and 446 deletions.
25 changes: 25 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
version: 2.1

# Anchors in case we need to override the defaults from the orb
#baselibs_version: &baselibs_version v7.17.0
#bcs_version: &bcs_version v11.4.0

orbs:
ci: geos-esm/circleci-tools@2

workflows:
build-test:
jobs:
# Build GEOSldas
- ci/build:
name: build-GEOSldas-on-<< matrix.compiler >>
context:
- docker-hub-creds
matrix:
parameters:
compiler: [ifort, gfortran]
#baselibs_version: *baselibs_version
repo: GEOSldas
checkout_fixture: true
mepodevelop: false
persist_workspace: false # Needs to be true to run fv3/gcm experiment, costs extra
18 changes: 18 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# This is a comment.
# Each line is a file pattern followed by one or more owners.
# Order is important; the last matching pattern takes the most
# precedence.

# LDAS Gatekeepers own all files
* @GEOS-ESM/ldas-gatekeepers

# The LDAS gatekeepers and CMake should know/approve these
/.github/ @GEOS-ESM/cmake-team @GEOS-ESM/ldas-gatekeepers
/.circleci/ @GEOS-ESM/cmake-team @GEOS-ESM/ldas-gatekeepers
/.codebuild/ @GEOS-ESM/cmake-team @GEOS-ESM/ldas-gatekeepers

# The GEOS CMake Team should be notified about changes to the CMakeLists.txt files in this repository
CMakeLists.txt @GEOS-ESM/cmake-team @GEOS-ESM/ldas-gatekeepers

# The GEOS CMake Team should be notified about and approve config changes
/config/ @GEOS-ESM/cmake-team @GEOS-ESM/ldas-gatekeepers
10 changes: 10 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE/auto_pr_to_mapl3.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
## :memo: Automatic PR: `develop``release/MAPL-v3`

### Description

<!-- Write your description here -->

## :file_folder: Modified files
<!-- Diff files - START -->
<!-- Diff files - END -->

30 changes: 30 additions & 0 deletions .github/workflows/push-to-develop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Push to Develop

on:
push:
branches:
- develop

jobs:
pull_request:
name: Create Pull Request
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Run the action
uses: devops-infra/[email protected]
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
source_branch: develop
target_branch: release/MAPL-v3
label: automatic,MAPL3,Skip Changelog
template: .github/PULL_REQUEST_TEMPLATE/auto_pr_to_mapl3.md
get_diff: true
assignee: ${{ github.actor }}
old_string: "<!-- Write your description here -->"
new_string: ${{ github.event.commits[0].message }}
title: Auto PR - develop → MAPL-v3 - ${{ github.event.commits[0].message }}

12 changes: 11 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,22 @@
# Changelog
# Changelog for `GEOSldas_GridComp`

All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

-----------------------------

## [Unreleased]

-----------------------------

## [v1.0.0] - 2024-03-26

- Inaugural version. 0-diff vs. GEOSldas v18.0.0.

-----------------------------

### Added

### Changed
Expand Down
4 changes: 3 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
esma_set_this ()

esma_add_subdirectory(GEOSgcm_GridComp )
esma_add_subdirectory(GEOSgcm_GridComp)

set (alldirs
GEOSmetforce_GridComp
Expand All @@ -15,3 +15,5 @@ esma_add_library(${this}
SUBDIRS LDAS_Shared
DEPENDENCIES GEOSland_GridComp makebcs MAPL
INCLUDES ${INC_ESMF})

esma_add_subdirectory(GEOSldas_App)
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Contributing to GEOSgcm_GridComp
# Contributing to GEOSldas_GridComp

Contributing code to GEOSgcm_GridComp should be done via a Pull Request to this repository.
Contributing code to GEOSldas_GridComp should be done via a Pull Request to this repository.

## Contributor License Agreement (CLA)

Expand Down
Loading

0 comments on commit a740464

Please sign in to comment.