Merge changes from source branch, auto-resolving conflicts

podaac · Mar 27, 2024 · e3ee6cd · e3ee6cd
2 parents fd0c810 + 138e1f9
commit e3ee6cd
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,7 +3,13 @@ name: Build 'n Deploy
 on: 
   push:
     branches:
-      - '*'
+      - main
+      - develop
+      - 'release/**'
+      - 'feature/**'
+      - 'issue/**'
+      - 'issues/**'
+      - 'dependabot/**'
     tags-ignore:
       - '*'
     paths-ignore:

diff --git a/CHANGE b/CHANGE
@@ -0,0 +1,3 @@
+podaac/swodlr-ingest-to-sds deployment 
+podaac/swodlr-ingest-to-sds deployment 
+podaac/swodlr-ingest-to-sds deployment 
diff --git a/bumpver.toml b/bumpver.toml
@@ -1,5 +1,5 @@
 [bumpver]
-current_version = "1.0.0"
+current_version = "1.0.0-rc1"
 version_pattern = "MAJOR.MINOR.PATCH[-TAGNUM]"
 commit = true
 tag = true

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "swodlr-ingest-to-sds"
-version = "1.0.0"
+version = "1.0.0-rc1"
 description = "A system for ingesting input products for the SWOT SDS"
 authors = ["podaac-tva <[email protected]>"]
 license = "Apache-2.0"