Release/1.0.1 (#25)

* Main (#24) * Update build.yml - added conditions for PR * bump version to 0.0.2 * Deploying * Deploying * bump version to 1.0.0-rc0 * Deploying * bump version to 1.0.0-rc1 * bump version to 1.0.0 * Release/1.0.1 (#23) * reverted back to build on all branches * Version bump commons (#20) * Main (#22) * Update build.yml - added conditions for PR * bump version to 0.0.2 * Deploying * Deploying * bump version to 1.0.0-rc0 * Deploying * bump version to 1.0.0-rc1 * bump version to 1.0.0 --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: cqbanh <[email protected]> * Update to utilize new commons (#21) * Update terraform to make PCM release tags optional * Update submit_to_sds to utilize new auto version selection * Fix tests * bumping version to 1.0.1 * bump version to 1.0.1-alpha1 * Update CHANGE * Update push on branches * bump version to 1.0.1-rc0 * bump version to 1.0.1-rc1 --------- Co-authored-by: Josh Garde <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: cqbanh <[email protected]> Co-authored-by: Curtis Banh <curtis.q.banhjpl.nasa.gov> * bump version to 1.0.1 * Update bumpver.toml --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: cqbanh <[email protected]> Co-authored-by: Josh Garde <[email protected]> * bump version to 1.0.2-alpha1 * update bumpver for alpha * bump version to 1.0.2-alpha1 * update bumpver for PR * bump version to 1.0.2-alpha2 * changed version back to 1.0.1 * update trigger branches * bump version to 1.0.2-alpha3 * test build * bump version to 1.0.2-alpha4 * setting version back to 1.0.1 * bump version to 1.0.2-alpha5 * bump version to 1.0.2-alpha6 * bump version to 1.0.2-alpha7 * changed version to 1.0.1 * bump version to 1.0.1-rc0 --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: cqbanh <[email protected]> Co-authored-by: Josh Garde <[email protected]> Co-authored-by: Curtis Banh <curtis.q.banhjpl.nasa.gov>
podaac · Jun 14, 2024 · 989ca3b · 989ca3b
1 parent 7851159
commit 989ca3b
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 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:
@@ -81,23 +87,23 @@ jobs:
 
           TARGET_ENV=${{ github.event.inputs.venue }}
       - name: Bump alpha version
-        if: github.ref == 'refs/heads/develop' && github.event_name != 'workflow_dispatch' && github.event_name != 'pull_request'
+        if: github.ref == 'refs/heads/develop' && github.event_name != 'workflow_dispatch'
         run: |
-          TAG=$(bumpver show -e | awk -F= '$1 == "TAG" {print $2};')
+          TAG=$(bumpver show -n -e | awk -F= '$1 == "TAG" {print $2};')
           if [ $TAG == 'final' ]; then
             # Bump patch version first then append tag
             bumpver update --patch --tag alpha --tag-num
           else
-            bumpver update --tag alpha --tag-num
+            bumpver update -f -n --tag alpha --tag-num
           fi
           echo "TARGET_ENV=SIT" >> $GITHUB_ENV
       - name: Bump rc version
-        if: startsWith(github.ref, 'refs/heads/release/') && github.event_name != 'workflow_dispatch' && github.event_name != 'pull_request'
+        if: startsWith(github.ref, 'refs/heads/release/') && github.event_name != 'workflow_dispatch'
         run: |
           bumpver update -f -n --tag rc --tag-num
           echo "TARGET_ENV=UAT" >> $GITHUB_ENV
       - name: Release version
-        if: github.ref == 'refs/heads/main' && github.event_name != 'workflow_dispatch' && github.event_name != 'pull_request'
+        if: github.ref == 'refs/heads/main' && github.event_name != 'workflow_dispatch'
         run: |
           bumpver update -f --tag final
           echo "TARGET_ENV=OPS" >> $GITHUB_ENV
@@ -128,9 +134,9 @@ jobs:
     environment: 
       name: ${{ needs.build.outputs.deploy_env }}
     if: |
-      (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.ref == 'refs/heads/develop') ||
+      (github.ref == 'refs/heads/main')   ||
+      (startsWith(github.ref, 'refs/heads/release') ) ||
       github.event_name == 'workflow_dispatch'
     steps:
       - name: Configure AWS credentials

diff --git a/CHANGE b/CHANGE
@@ -1,7 +1 @@
-<<<<<<< main
-Version 1.0.1
-=======
-podaac/swodlr-ingest-to-sds deployment 
-podaac/swodlr-ingest-to-sds deployment 
-podaac/swodlr-ingest-to-sds deployment 
->>>>>>> develop
+Version 1.0.1
diff --git a/bumpver.toml b/bumpver.toml
@@ -1,5 +1,5 @@
 [bumpver]
-current_version = "1.0.1"
+current_version = "1.0.1-rc0"
 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.1"
+version = "1.0.1-rc0"
 description = "A system for ingesting input products for the SWOT SDS"
 authors = ["podaac-tva <[email protected]>"]
 license = "Apache-2.0"