From 2566129564775d69af67620ebb7c5211125eb8d3 Mon Sep 17 00:00:00 2001
From: Curtis Banh <30607061+cqbanh@users.noreply.github.com>
Date: Tue, 26 Mar 2024 23:59:53 -0700
Subject: [PATCH 1/2] Merging main back to develop (#18)

* Update build.yml - added conditions for PR

* bump version to 0.0.2

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/workflows/build.yml | 12 ++++++------
 bumpver.toml                |  2 +-
 pyproject.toml              |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ac7fc63..02ca207 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -81,7 +81,7 @@ jobs:
 
           TARGET_ENV=${{ github.event.inputs.venue }}
       - name: Bump alpha version
-        if: github.ref == 'refs/heads/develop' && github.event_name != 'workflow_dispatch'
+        if: github.ref == 'refs/heads/develop' && github.event_name != 'workflow_dispatch' && github.event_name != 'pull_request'
         run: |
           TAG=$(bumpver show -e | awk -F= '$1 == "TAG" {print $2};')
           if [ $TAG == 'final' ]; then
@@ -92,12 +92,12 @@ jobs:
           fi
           echo "TARGET_ENV=SIT" >> $GITHUB_ENV
       - name: Bump rc version
-        if: startsWith(github.ref, 'refs/heads/release/') && github.event_name != 'workflow_dispatch'
+        if: startsWith(github.ref, 'refs/heads/release/') && github.event_name != 'workflow_dispatch' && github.event_name != 'pull_request'
         run: |
           bumpver update -f --tag rc --tag-num
           echo "TARGET_ENV=UAT" >> $GITHUB_ENV
       - name: Release version
-        if: github.ref == 'refs/heads/main' && github.event_name != 'workflow_dispatch'
+        if: github.ref == 'refs/heads/main' && github.event_name != 'workflow_dispatch' && github.event_name != 'pull_request'
         run: |
           bumpver update -f --tag final
           echo "TARGET_ENV=OPS" >> $GITHUB_ENV
@@ -128,9 +128,9 @@ jobs:
     environment: 
       name: ${{ needs.build.outputs.deploy_env }}
     if: |
-      github.ref == 'refs/heads/develop' ||
-      github.ref == 'refs/heads/main'    ||
-      startsWith(github.ref, 'refs/heads/release') ||
+      (github.ref == 'refs/heads/develop' && github.event_name != 'pull_request') ||
+      (github.ref == 'refs/heads/main' && github.event_name != 'pull_request')   ||
+      (startsWith(github.ref, 'refs/heads/release') && github.event_name != 'pull_request') ||
       github.event_name == 'workflow_dispatch'
     steps:
       - name: Configure AWS credentials
diff --git a/bumpver.toml b/bumpver.toml
index 6947817..4f2d0e4 100644
--- a/bumpver.toml
+++ b/bumpver.toml
@@ -1,5 +1,5 @@
 [bumpver]
-current_version = "0.0.2-alpha14"
+current_version = "0.0.2"
 version_pattern = "MAJOR.MINOR.PATCH[-TAGNUM]"
 commit = true
 tag = true
diff --git a/pyproject.toml b/pyproject.toml
index 59f1a0a..f70d963 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "swodlr-ingest-to-sds"
-version = "0.0.2-alpha14"
+version = "0.0.2"
 description = "A system for ingesting input products for the SWOT SDS"
 authors = ["podaac-tva <podaac-tva@jpl.nasa.gov>"]
 license = "Apache-2.0"

From 91a5a1d9883c69afe31ec54da04c6591df78eea7 Mon Sep 17 00:00:00 2001
From: Curtis Banh <curtis.q.banh@jpl.nasa.gov>
Date: Wed, 27 Mar 2024 00:08:28 -0700
Subject: [PATCH 2/2] bump version

---
 bumpver.toml   | 2 +-
 pyproject.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bumpver.toml b/bumpver.toml
index 4f2d0e4..96d7764 100644
--- a/bumpver.toml
+++ b/bumpver.toml
@@ -1,5 +1,5 @@
 [bumpver]
-current_version = "0.0.2"
+current_version = "1.0.0"
 version_pattern = "MAJOR.MINOR.PATCH[-TAGNUM]"
 commit = true
 tag = true
diff --git a/pyproject.toml b/pyproject.toml
index f70d963..94e22f6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "swodlr-ingest-to-sds"
-version = "0.0.2"
+version = "1.0.0"
 description = "A system for ingesting input products for the SWOT SDS"
 authors = ["podaac-tva <podaac-tva@jpl.nasa.gov>"]
 license = "Apache-2.0"