submodule conflict

.github/ISSUE_TEMPLATE/bug_report.md

@@ -43,14 +43,15 @@ Describe the steps to reproduce the behavior:
 - [ ] Select **scientist(s)** or **no scientist** required
 
 ### Labels ###
+- [ ] Review default **alert** labels
 - [ ] Select **component(s)**
 - [ ] Select **priority**
 - [ ] Select **requestor(s)**
 
-### Projects and Milestone ###
-- [ ] Select **Organization** level **Project** for support of the current coordinated release
-- [ ] Select **Repository** level **Project** for development toward the next official release or add **alert: NEED CYCLE ASSIGNMENT** label
+### Milestone and Projects ###
 - [ ] Select **Milestone** as the next bugfix version
+- [ ] Select **Coordinated METplus-X.Y Support** project for support of the current coordinated release
+- [ ] Select **METexpress-X.Y.Z Development** project for development toward the next official release
 
 ## Define Related Issue(s) ##
 Consider the impact to the other METplus components.
@@ -69,15 +70,15 @@ Branch name: `bugfix_<Issue Number>_main_<Version>_<Description>`
 - [ ] Submit a pull request to merge into **main_\<Version>**.
 Pull request: `bugfix <Issue Number> main_<Version> <Description>`
 - [ ] Define the pull request metadata, as permissions allow.
-Select: **Reviewer(s)** and **Development** issues
-Select: **Organization** level software support **Project** for the current coordinated release
+Select: **Reviewer(s)** and **Development** issue
 Select: **Milestone** as the next bugfix version
+Select: Coordinated METplus-X.Y Support project for support of the current coordinated release
 - [ ] Iterate until the reviewer(s) accept and merge your changes.
 - [ ] Delete your fork or branch.
 - [ ] Complete the steps above to fix the bug on the **development** branch.
 Branch name:  `bugfix_<Issue Number>_development_<Description>`
 Pull request: `bugfix <Issue Number> development <Description>`
-Select: **Reviewer(s)** and **Development** issues
-Select: **Repository** level development cycle **Project** for the next official release
+Select: **Reviewer(s)** and **Development** issue
 Select: **Milestone** as the next official version
+Select: **METexpress-X.Y.Z Development** project for development toward the next official release
 - [ ] Close this issue.

.github/ISSUE_TEMPLATE/enhancement_request.md

@@ -33,13 +33,14 @@ Consider breaking the enhancement down into sub-issues.
 - [ ] Select **scientist(s)** or **no scientist** required
 
 ### Labels ###
+- [ ] Review default **alert** labels
 - [ ] Select **component(s)**
 - [ ] Select **priority**
 - [ ] Select **requestor(s)**
 
-### Projects and Milestone ###
-- [ ] Select **Repository** and/or **Organization** level **Project(s)** or add **alert: NEED CYCLE ASSIGNMENT** label
-- [ ] Select **Milestone** as the next official version or **Future Versions**
+### Milestone and Projects ###
+- [ ] Select **Milestone** as a **METexpress-X.Y.Z** version, **Consider for Next Release**, or **Backlog of Development Ideas**
+- [ ] For a **METexpress-X.Y.Z** version, select the **METexpress-X.Y.Z Development** project
 
 ## Define Related Issue(s) ##
 Consider the impact to the other METplus components.
@@ -58,9 +59,9 @@ Branch name: `feature_<Issue Number>_<Description>`
 - [ ] Submit a pull request to merge into **development**.
 Pull request: `feature <Issue Number> <Description>`
 - [ ] Define the pull request metadata, as permissions allow.
-Select: **Reviewer(s)** and **Development** issues
-Select: **Repository** level development cycle **Project** for the next official release
+Select: **Reviewer(s)** and **Development** issue
 Select: **Milestone** as the next official version
+Select: **METexpress-X.Y.Z Development** project for development toward the next official release
 - [ ] Iterate until the reviewer(s) accept and merge your changes.
 - [ ] Delete your fork or branch.
 - [ ] Close this issue.

.github/ISSUE_TEMPLATE/new_feature_request.md

@@ -37,13 +37,14 @@ Consider breaking the new feature down into sub-issues.
 - [ ] Select **scientist(s)** or **no scientist** required
 
 ### Labels ###
+- [ ] Review default **alert** labels
 - [ ] Select **component(s)**
 - [ ] Select **priority**
 - [ ] Select **requestor(s)**
 
-### Projects and Milestone ###
-- [ ] Select **Repository** and/or **Organization** level **Project(s)** or add **alert: NEED CYCLE ASSIGNMENT** label
-- [ ] Select **Milestone** as the next official version or **Future Versions**
+### Milestone and Projects ###
+- [ ] Select **Milestone** as a **METexpress-X.Y.Z** version, **Consider for Next Release**, or **Backlog of Development Ideas**
+- [ ] For a **METexpress-X.Y.Z** version, select the **METexpress-X.Y.Z Development** project
 
 ## Define Related Issue(s) ##
 Consider the impact to the other METplus components.
@@ -62,9 +63,9 @@ Branch name: `feature_<Issue Number>_<Description>`
 - [ ] Submit a pull request to merge into **development**.
 Pull request: `feature <Issue Number> <Description>`
 - [ ] Define the pull request metadata, as permissions allow.
-Select: **Reviewer(s)** and **Development** issues
-Select: **Repository** level development cycle **Project** for the next official release
+Select: **Reviewer(s)** and **Development** issue
 Select: **Milestone** as the next official version
+Select: **METexpress-X.Y.Z Development** project for development toward the next official release
 - [ ] Iterate until the reviewer(s) accept and merge your changes.
 - [ ] Delete your fork or branch.
 - [ ] Close this issue.

.github/ISSUE_TEMPLATE/sub-issue.md

@@ -23,10 +23,11 @@ This is a sub-issue of #*List the parent issue number here*.
 - [ ] Select **scientist(s)** or **no scientist** required
 
 ### Labels ###
+- [ ] Review default **alert** labels
 - [ ] Select **component(s)**
 - [ ] Select **priority**
 - [ ] Select **requestor(s)**
 
-### Projects and Milestone ###
-- [ ] Select **Repository** and/or **Organization** level **Project(s)** or add **alert: NEED CYCLE ASSIGNMENT** label
-- [ ] Select **Milestone** as the next official version or **Future Versions**
+### Milestone and Projects ###
+- [ ] Select **Milestone** as a **METexpress-X.Y.Z** version, **Consider for Next Release**, or **Backlog of Development Ideas**
+- [ ] For a **METexpress-X.Y.Z** version, select the **METexpress-X.Y.Z Development** project

.github/ISSUE_TEMPLATE/task.md

@@ -33,13 +33,14 @@ Consider breaking the task down into sub-issues.
 - [ ] Select **scientist(s)** or **no scientist** required
 
 ### Labels ###
+- [ ] Review default **alert** labels
 - [ ] Select **component(s)**
 - [ ] Select **priority**
 - [ ] Select **requestor(s)**
 
-### Projects and Milestone ###
-- [ ] Select **Repository** and/or **Organization** level **Project(s)** or add **alert: NEED CYCLE ASSIGNMENT** label
-- [ ] Select **Milestone** as the next official version or **Future Versions**
+### Milestone and Projects ###
+- [ ] Select **Milestone** as a **METexpress-X.Y.Z** version, **Consider for Next Release**, or **Backlog of Development Ideas**
+- [ ] For a **METexpress-X.Y.Z** version, select the **METexpress-X.Y.Z Development** project
 
 ## Define Related Issue(s) ##
 Consider the impact to the other METplus components.
@@ -58,9 +59,9 @@ Branch name: `feature_<Issue Number>_<Description>`
 - [ ] Submit a pull request to merge into **development**.
 Pull request: `feature <Issue Number> <Description>`
 - [ ] Define the pull request metadata, as permissions allow.
-Select: **Reviewer(s)** and **Development** issues
-Select: **Repository** level development cycle **Project** for the next official release
+Select: **Reviewer(s)** and **Development** issue
 Select: **Milestone** as the next official version
+Select: **METexpress-X.Y.Z Development** project for development toward the next official release
 - [ ] Iterate until the reviewer(s) accept and merge your changes.
 - [ ] Delete your fork or branch.
 - [ ] Close this issue.

.github/pull_request_template.md

@@ -19,9 +19,9 @@ See the [METplus Workflow](https://metplus.readthedocs.io/en/latest/Contributors
 - [ ] Complete the PR definition above.
 - [ ] Ensure the PR title matches the feature or bugfix branch name.
 - [ ] Define the PR metadata, as permissions allow.
-Select: **Reviewer(s)**
-Select: **Organization** level software support **Project** or **Repository** level development cycle **Project**
+Select: **Reviewer(s)** and **Development** issue
 Select: **Milestone** as the version that will include these changes
+Select: **Coordinated METplus-X.Y Support** project for bugfix releases or **METexpress-X.Y.Z Development** project for official releases
 - [ ] After submitting the PR, select the :gear: icon in the **Development** section of the right hand sidebar. Search for the issue that this PR will close and select it, if it is not already selected.
 - [ ] After the PR is approved, merge your changes. If permissions do not allow this, request that the reviewer do the merge.
 - [ ] Close the linked issue and delete your feature or bugfix branch from GitHub.

.github/workflows/build.yml

@@ -17,7 +17,6 @@ jobs:
       fail-fast: true
       matrix:
         app: 
-          - met-airquality
           - met-anomalycor
           - met-cyclone
           - met-ensemble
@@ -50,7 +49,6 @@ jobs:
       fail-fast: true
       matrix:
         app: 
-          - met-airquality
           - met-anomalycor
           - met-cyclone
           - met-ensemble

.github/workflows/deploy.yml

@@ -16,7 +16,6 @@ jobs:
       fail-fast: true
       matrix:
         deploy: # List of apps to deploy
-          - met-airquality
           - met-anomalycor
           - met-cyclone
           - met-ensemble

.github/workflows/prune-pr-images.yml

@@ -12,7 +12,6 @@ jobs:
       fail-fast: false
       matrix:
         app:
-          - met-airquality
           - met-anomalycor
           - met-cyclone
           - met-ensemble

.github/workflows/prune-untagged-images.yml

@@ -13,7 +13,6 @@ jobs:
       fail-fast: false
       matrix:
         app:
-          - met-airquality
           - met-anomalycor
           - met-cyclone
           - met-ensemble

.github/workflows/release-checksum.yml

@@ -9,6 +9,6 @@ jobs:
   add-checksum:
      runs-on: ubuntu-latest
      steps:
-        - uses: dtcenter/metplus-action-release-checksum@v1
+        - uses: dtcenter/metplus-action-release-checksum@v2
           with:
              token: ${{ secrets.METPLUS_BOT_TOKEN }}

Dockerfile

@@ -1,5 +1,5 @@
 # This tag here should match the app's Meteor version, per .meteor/release
-FROM geoffreybooth/meteor-base:2.14 AS meteor-builder
+FROM geoffreybooth/meteor-base:2.16 AS meteor-builder
 
 ARG APPNAME