Merge changes from source branch, auto-resolving conflicts

podaac · Mar 27, 2024 · 9e77d52 · 9e77d52
2 parents 021df54 + 8cee20f
commit 9e77d52
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 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:
@@ -212,4 +218,4 @@ jobs:
             {
               "message": "${{ github.repository }} [version ${{ env.SUBMODULE_VERSION }}] has been deployed to the ${{ needs.build.outputs.deploy_env }} environment"
             }
-            
+            
diff --git a/CHANGE b/CHANGE
@@ -0,0 +1,2 @@
+podaac/swodlr-user-notify deployment 
+podaac/swodlr-user-notify deployment 
diff --git a/bumpver.toml b/bumpver.toml
@@ -1,5 +1,5 @@
 [bumpver]
-current_version = "0.0.3"
+current_version = "0.0.7-rc0"
 version_pattern = "MAJOR.MINOR.PATCH[-TAGNUM]"
 pre_commit_hook = "scripts/npm-version.sh"
 commit = true

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "swodlr-user-notify",
-  "version": "0.0.3",
+  "version": "0.0.7-rc0",
   "description": "",
   "main": "index.js",
   "type": "module",