Merge pull request #119 from falconstryker/devel

adding ability to do github actions on merge/PR to main as well as devel

Author: rurata

.github/workflows/marscalendar_test.yml

@@ -6,7 +6,7 @@ concurrency:
 on:
   # Trigger the workflow on push to devel branch
   push:
-    branches: [ devel ]
+    branches: [ devel, main ]
     paths:
       - 'bin/MarsCalendar.py'
       - 'tests/test_marscalendar.py'
@@ -15,7 +15,7 @@ on:
   workflow_dispatch:
   # Trigger on pull requests that modify MarsCalendar or tests
   pull_request:
-    branches: [ devel ]
+    branches: [ devel, main ]
     paths:
       - 'bin/MarsCalendar.py'
       - 'tests/test_marscalendar.py'

.github/workflows/marsfiles_test.yml

@@ -6,7 +6,7 @@ concurrency:
 on:
   # Trigger the workflow on push to devel branch
   push:
-    branches: [ devel ]
+    branches: [ devel, main ]
     paths:
       - 'bin/MarsFiles.py'
       - 'tests/test_marsfiles.py'
@@ -16,7 +16,7 @@ on:
   workflow_dispatch:
   # Trigger on pull requests that modify relevant files
   pull_request:
-    branches: [ devel ]
+    branches: [ devel, main ]
     paths:
       - 'bin/MarsFiles.py'
       - 'tests/test_marsfiles.py'

.github/workflows/marsformat_test.yml

@@ -6,7 +6,7 @@ concurrency:
 on:
   # Trigger the workflow on push to devel branch
   push:
-    branches: [ devel ]
+    branches: [ devel, main ]
     paths:
       - 'bin/MarsFormat.py'
       - 'tests/test_marsformat.py'
@@ -15,7 +15,7 @@ on:
   workflow_dispatch:
   # Trigger on pull requests that modify MarsFormat or tests
   pull_request:
-    branches: [ devel ]
+    branches: [ devel, main ]
     paths:
       - 'bin/MarsFormat.py'
       - 'tests/test_marsformat.py'

.github/workflows/marsinterp_test.yml

@@ -6,7 +6,7 @@ concurrency:
 on:
   # Trigger the workflow on push to devel branch
   push:
-    branches: [ devel ]
+    branches: [ devel, main ]
     paths:
       - 'bin/MarsInterp.py'
       - 'tests/test_marsinterp.py'
@@ -16,7 +16,7 @@ on:
   workflow_dispatch:
   # Trigger on pull requests that modify relevant files
   pull_request:
-    branches: [ devel ]
+    branches: [ devel, main ]
     paths:
       - 'bin/MarsInterp.py'
       - 'tests/test_marsinterp.py'

.github/workflows/marsplot_test.yml

@@ -6,7 +6,7 @@ concurrency:
 on:
   # Trigger the workflow on push to devel branch
   push:
-    branches: [ devel ]
+    branches: [ devel, main ]
     paths:
       - 'bin/MarsPlot.py'
       - 'tests/test_marsplot.py'
@@ -15,7 +15,7 @@ on:
   workflow_dispatch:
   # Trigger on pull requests that modify MarsPlot or tests
   pull_request:
-    branches: [ devel ]
+    branches: [ devel, main ]
     paths:
       - 'bin/MarsPlot.py'
       - 'tests/test_marsplot.py'

.github/workflows/marspull_test.yml

@@ -6,7 +6,7 @@ concurrency:
 on:
   # Trigger the workflow on push to devel branch
   push:
-    branches: [ devel ]
+    branches: [ devel, main ]
     paths:
       - 'bin/MarsPull.py'
       - 'tests/test_marspull.py'
@@ -15,7 +15,7 @@ on:
   workflow_dispatch:
   # Trigger on pull requests that modify MarsFormat or tests
   pull_request:
-    branches: [ devel ]
+    branches: [ devel, main ]
     paths:
       - 'bin/MarsPull.py'
       - 'tests/test_marspull.py'

.github/workflows/marsvars_test.yml

@@ -6,7 +6,7 @@ concurrency:
 on:
   # Trigger the workflow on push to devel branch
   push:
-    branches: [ devel ]
+    branches: [ devel, main ]
     paths:
       - 'bin/MarsVars.py'
       - 'tests/test_marsvars.py'
@@ -18,7 +18,7 @@ on:
   workflow_dispatch:
   # Trigger on pull requests that modify relevant files
   pull_request:
-    branches: [ devel ]
+    branches: [ devel, main ]
     paths:
       - 'bin/MarsVars.py'
       - 'tests/test_marsvars.py'